From f1fe1e77c91a725ef7ce86f5d494431522b4e4ba Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sun, 9 Sep 2018 19:58:02 -0400
Subject: [PATCH] Bug 1489917 - Remove the XPCOM component registration for
 nsOfflineCacheUpdate; r=baku

Differential Revision: https://phabricator.services.mozilla.com/D5391
---
 docshell/build/nsDocShellModule.cpp      |  4 ----
 dom/offline/moz.build                    |  1 +
 dom/offline/nsDOMOfflineResourceList.cpp |  8 ++------
 uriloader/prefetch/nsCPrefetchService.h  | 15 ---------------
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/docshell/build/nsDocShellModule.cpp b/docshell/build/nsDocShellModule.cpp
index 389bc3e95579..13c1f36e2a56 100644
--- a/docshell/build/nsDocShellModule.cpp
+++ b/docshell/build/nsDocShellModule.cpp
@@ -82,7 +82,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsExternalProtocolHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrefetchService, Init)
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsOfflineCacheUpdateService,
                                          nsOfflineCacheUpdateService::GetInstance)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsOfflineCacheUpdate)
 NS_GENERIC_FACTORY_CONSTRUCTOR(PlatformLocalHandlerApp_t)
 #ifdef MOZ_ENABLE_DBUS
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDBusHandlerApp)
@@ -108,7 +107,6 @@ NS_DEFINE_NAMED_CID(NS_EXTERNALHELPERAPPSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_EXTERNALPROTOCOLHANDLER_CID);
 NS_DEFINE_NAMED_CID(NS_PREFETCHSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_OFFLINECACHEUPDATESERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_OFFLINECACHEUPDATE_CID);
 NS_DEFINE_NAMED_CID(NS_LOCALHANDLERAPP_CID);
 NS_DEFINE_NAMED_CID(NS_OSPERMISSIONREQUEST_CID);
 #ifdef MOZ_ENABLE_DBUS
@@ -136,7 +134,6 @@ const mozilla::Module::CIDEntry kDocShellCIDs[] = {
   { &kNS_EXTERNALPROTOCOLHANDLER_CID, false, nullptr, nsExternalProtocolHandlerConstructor },
   { &kNS_PREFETCHSERVICE_CID, false, nullptr, nsPrefetchServiceConstructor },
   { &kNS_OFFLINECACHEUPDATESERVICE_CID, false, nullptr, nsOfflineCacheUpdateServiceConstructor },
-  { &kNS_OFFLINECACHEUPDATE_CID, false, nullptr, nsOfflineCacheUpdateConstructor },
   { &kNS_LOCALHANDLERAPP_CID, false, nullptr, PlatformLocalHandlerApp_tConstructor },
 #ifdef MOZ_ENABLE_DBUS
   { &kNS_DBUSHANDLERAPP_CID, false, nullptr, nsDBusHandlerAppConstructor },
@@ -192,7 +189,6 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = {
   { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX"default", &kNS_EXTERNALPROTOCOLHANDLER_CID },
   { NS_PREFETCHSERVICE_CONTRACTID, &kNS_PREFETCHSERVICE_CID },
   { NS_OFFLINECACHEUPDATESERVICE_CONTRACTID, &kNS_OFFLINECACHEUPDATESERVICE_CID },
-  { NS_OFFLINECACHEUPDATE_CONTRACTID, &kNS_OFFLINECACHEUPDATE_CID },
   { NS_LOCALHANDLERAPP_CONTRACTID, &kNS_LOCALHANDLERAPP_CID },
 #ifdef MOZ_ENABLE_DBUS
   { NS_DBUSHANDLERAPP_CONTRACTID, &kNS_DBUSHANDLERAPP_CID },
diff --git a/dom/offline/moz.build b/dom/offline/moz.build
index f10fe905706a..c77427a4967c 100644
--- a/dom/offline/moz.build
+++ b/dom/offline/moz.build
@@ -16,6 +16,7 @@ UNIFIED_SOURCES += [
 
 LOCAL_INCLUDES += [
     '/dom/base',
+    '/uriloader/prefetch',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/offline/nsDOMOfflineResourceList.cpp b/dom/offline/nsDOMOfflineResourceList.cpp
index 61d95c998be9..749ab061d560 100644
--- a/dom/offline/nsDOMOfflineResourceList.cpp
+++ b/dom/offline/nsDOMOfflineResourceList.cpp
@@ -21,6 +21,7 @@
 #include "nsIObserverService.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIWebNavigation.h"
+#include "nsOfflineCacheUpdate.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/OfflineResourceListBinding.h"
 #include "mozilla/EventDispatcher.h"
@@ -390,12 +391,7 @@ nsDOMOfflineResourceList::MozAdd(const nsAString& aURI, ErrorResult& aRv)
 
   ClearCachedKeys();
 
-  nsCOMPtr<nsIOfflineCacheUpdate> update =
-    do_CreateInstance(NS_OFFLINECACHEUPDATE_CONTRACTID, &rv);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    aRv.Throw(rv);
-    return;
-  }
+  nsCOMPtr<nsIOfflineCacheUpdate> update = new nsOfflineCacheUpdate();
 
   nsAutoCString clientID;
   rv = appCache->GetClientID(clientID);
diff --git a/uriloader/prefetch/nsCPrefetchService.h b/uriloader/prefetch/nsCPrefetchService.h
index d74d89fe7bb7..0470776f20e7 100644
--- a/uriloader/prefetch/nsCPrefetchService.h
+++ b/uriloader/prefetch/nsCPrefetchService.h
@@ -34,19 +34,4 @@
     {0x94, 0xe0, 0xa6, 0xe9, 0x1c, 0xa4, 0x4d, 0x8a} \
 }
 
-/**
- * nsOfflineCacheUpdate : nsIOfflineCacheUpdate
- */
-
-#define NS_OFFLINECACHEUPDATE_CONTRACTID \
-  "@mozilla.org/offlinecacheupdate;1"
-#define NS_OFFLINECACHEUPDATE_CID                    \
-{ /* e56f5e01-c7cc-4675-a9d7-b8f1e4127295 */         \
-    0xe56f5e01,                                      \
-    0xc7cc,                                          \
-    0x4675,                                          \
-    {0xa9, 0xd7, 0xb8, 0xf1, 0xe4, 0x12, 0x72, 0x95} \
-}
-
-
 #endif // !nsCPrefetchService_h__