Issue %3005 - Move uriloader/prefetch to docshell/

19 files changed, 4 insertions, 4 deletions

diff --git a/docshell/build/moz.build b/docshell/build/moz.build
index 942904c46..80bee2816 100644
--- a/docshell/build/moz.build
+++ b/docshell/build/moz.build
@@ -12,11 +12,11 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/docshell/base',
-    '/docshell/shistory',
+    '../base',
+    '../prefetch',
+    '../shistory',
     '/uriloader/base',
     '/uriloader/exthandler',
-    '/uriloader/prefetch',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
diff --git a/docshell/moz.build b/docshell/moz.build
index 2278c5a2f..54161e336 100644
--- a/docshell/moz.build
+++ b/docshell/moz.build
@@ -7,6 +7,7 @@ DIRS += [
     'base',
     'shistory',
     'build',
+    'prefetch',
     'resources/content',
 ]
 
diff --git a/uriloader/prefetch/OfflineCacheUpdateChild.cpp b/docshell/prefetch/OfflineCacheUpdateChild.cpp
index 555508c37..555508c37 100644
--- a/uriloader/prefetch/OfflineCacheUpdateChild.cpp
+++ b/docshell/prefetch/OfflineCacheUpdateChild.cpp
diff --git a/uriloader/prefetch/OfflineCacheUpdateChild.h b/docshell/prefetch/OfflineCacheUpdateChild.h
index 89d1e6f1f..89d1e6f1f 100644
--- a/uriloader/prefetch/OfflineCacheUpdateChild.h
+++ b/docshell/prefetch/OfflineCacheUpdateChild.h
diff --git a/uriloader/prefetch/OfflineCacheUpdateGlue.cpp b/docshell/prefetch/OfflineCacheUpdateGlue.cpp
index 71ca986ff..71ca986ff 100644
--- a/uriloader/prefetch/OfflineCacheUpdateGlue.cpp
+++ b/docshell/prefetch/OfflineCacheUpdateGlue.cpp
diff --git a/uriloader/prefetch/OfflineCacheUpdateGlue.h b/docshell/prefetch/OfflineCacheUpdateGlue.h
index 92201ec82..92201ec82 100644
--- a/uriloader/prefetch/OfflineCacheUpdateGlue.h
+++ b/docshell/prefetch/OfflineCacheUpdateGlue.h
diff --git a/uriloader/prefetch/OfflineCacheUpdateParent.cpp b/docshell/prefetch/OfflineCacheUpdateParent.cpp
index 0381ec3f6..0381ec3f6 100644
--- a/uriloader/prefetch/OfflineCacheUpdateParent.cpp
+++ b/docshell/prefetch/OfflineCacheUpdateParent.cpp
diff --git a/uriloader/prefetch/OfflineCacheUpdateParent.h b/docshell/prefetch/OfflineCacheUpdateParent.h
index f6dbc1cb2..f6dbc1cb2 100644
--- a/uriloader/prefetch/OfflineCacheUpdateParent.h
+++ b/docshell/prefetch/OfflineCacheUpdateParent.h
diff --git a/uriloader/prefetch/POfflineCacheUpdate.ipdl b/docshell/prefetch/POfflineCacheUpdate.ipdl
index 7f1614d81..7f1614d81 100644
--- a/uriloader/prefetch/POfflineCacheUpdate.ipdl
+++ b/docshell/prefetch/POfflineCacheUpdate.ipdl
diff --git a/uriloader/prefetch/moz.build b/docshell/prefetch/moz.build
index d60197953..d60197953 100644
--- a/uriloader/prefetch/moz.build
+++ b/docshell/prefetch/moz.build
diff --git a/uriloader/prefetch/nsCPrefetchService.h b/docshell/prefetch/nsCPrefetchService.h
index d74d89fe7..d74d89fe7 100644
--- a/uriloader/prefetch/nsCPrefetchService.h
+++ b/docshell/prefetch/nsCPrefetchService.h
diff --git a/uriloader/prefetch/nsIOfflineCacheUpdate.idl b/docshell/prefetch/nsIOfflineCacheUpdate.idl
index 1308a8de2..1308a8de2 100644
--- a/uriloader/prefetch/nsIOfflineCacheUpdate.idl
+++ b/docshell/prefetch/nsIOfflineCacheUpdate.idl
diff --git a/uriloader/prefetch/nsIPrefetchService.idl b/docshell/prefetch/nsIPrefetchService.idl
index 198320dd2..198320dd2 100644
--- a/uriloader/prefetch/nsIPrefetchService.idl
+++ b/docshell/prefetch/nsIPrefetchService.idl
diff --git a/uriloader/prefetch/nsOfflineCacheUpdate.cpp b/docshell/prefetch/nsOfflineCacheUpdate.cpp
index 8a4183429..8a4183429 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdate.cpp
+++ b/docshell/prefetch/nsOfflineCacheUpdate.cpp
diff --git a/uriloader/prefetch/nsOfflineCacheUpdate.h b/docshell/prefetch/nsOfflineCacheUpdate.h
index 2e6d6d30c..2e6d6d30c 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdate.h
+++ b/docshell/prefetch/nsOfflineCacheUpdate.h
diff --git a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp b/docshell/prefetch/nsOfflineCacheUpdateService.cpp
index 6a67af013..6a67af013 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
+++ b/docshell/prefetch/nsOfflineCacheUpdateService.cpp
diff --git a/uriloader/prefetch/nsPrefetchService.cpp b/docshell/prefetch/nsPrefetchService.cpp
index bd2b10d30..bd2b10d30 100644
--- a/uriloader/prefetch/nsPrefetchService.cpp
+++ b/docshell/prefetch/nsPrefetchService.cpp
diff --git a/uriloader/prefetch/nsPrefetchService.h b/docshell/prefetch/nsPrefetchService.h
index 883449e68..883449e68 100644
--- a/uriloader/prefetch/nsPrefetchService.h
+++ b/docshell/prefetch/nsPrefetchService.h
diff --git a/uriloader/moz.build b/uriloader/moz.build
index cc7e6b81c..64bc10682 100644
--- a/uriloader/moz.build
+++ b/uriloader/moz.build
@@ -6,5 +6,4 @@
 DIRS += [
     'base',
     'exthandler',
-    'prefetch',
 ]