Bug 1410471 - Remove StartupCacheWrapper and friends. r=froydnj

This class was needed for testing, but no longer.

MozReview-Commit-ID: AIk0kKlbScs

--HG--
extra : rebase_source : 35eed188e44dc4c9899479b35882461dd2cf4624

Author: amccreight

startupcache/StartupCache.cpp

@@ -19,7 +19,6 @@
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
 #include "nsIOutputStream.h"
-#include "nsIStartupCache.h"
 #include "nsIStorageStream.h"
 #include "nsIStreamBufferAccess.h"
 #include "nsIStringStream.h"
@@ -696,78 +695,5 @@ StartupCacheDebugOutputStream::PutBuffer(char* aBuffer, uint32_t aLength)
 }
 #endif //DEBUG
 
-StartupCacheWrapper* StartupCacheWrapper::gStartupCacheWrapper = nullptr;
-
-NS_IMPL_ISUPPORTS(StartupCacheWrapper, nsIStartupCache)
-
-StartupCacheWrapper::~StartupCacheWrapper()
-{
-  MOZ_ASSERT(gStartupCacheWrapper == this);
-  gStartupCacheWrapper = nullptr;
-}
-
-already_AddRefed<StartupCacheWrapper> StartupCacheWrapper::GetSingleton()
-{
-  if (!gStartupCacheWrapper)
-    gStartupCacheWrapper = new StartupCacheWrapper();
-
-  return do_AddRef(gStartupCacheWrapper);
-}
-
-nsresult
-StartupCacheWrapper::GetBuffer(const char* id, char** outbuf, uint32_t* length)
-{
-  StartupCache* sc = StartupCache::GetSingleton();
-  if (!sc) {
-    return NS_ERROR_NOT_INITIALIZED;
-  }
-  UniquePtr<char[]> buf;
-  nsresult rv = sc->GetBuffer(id, &buf, length);
-  *outbuf = buf.release();
-  return rv;
-}
-
-nsresult
-StartupCacheWrapper::PutBuffer(const char* id, const char* inbuf, uint32_t length)
-{
-  StartupCache* sc = StartupCache::GetSingleton();
-  if (!sc) {
-    return NS_ERROR_NOT_INITIALIZED;
-  }
-  return sc->PutBuffer(id, inbuf, length);
-}
-
-nsresult
-StartupCacheWrapper::InvalidateCache()
-{
-  StartupCache* sc = StartupCache::GetSingleton();
-  if (!sc) {
-    return NS_ERROR_NOT_INITIALIZED;
-  }
-  sc->InvalidateCache();
-  return NS_OK;
-}
-
-nsresult
-StartupCacheWrapper::GetDebugObjectOutputStream(nsIObjectOutputStream* stream,
-                                                nsIObjectOutputStream** outStream)
-{
-  StartupCache* sc = StartupCache::GetSingleton();
-  if (!sc) {
-    return NS_ERROR_NOT_INITIALIZED;
-  }
-  return sc->GetDebugObjectOutputStream(stream, outStream);
-}
-
-nsresult
-StartupCacheWrapper::GetObserver(nsIObserver** obv) {
-  StartupCache* sc = StartupCache::GetSingleton();
-  if (!sc) {
-    return NS_ERROR_NOT_INITIALIZED;
-  }
-  NS_ADDREF(*obv = sc->mListener);
-  return NS_OK;
-}
-
 } // namespace scache
 } // namespace mozilla

startupcache/StartupCache.h

@@ -10,16 +10,15 @@
 #include "nsComponentManagerUtils.h"
 #include "nsTArray.h"
 #include "nsZipArchive.h"
-#include "nsIStartupCache.h"
 #include "nsITimer.h"
 #include "nsIMemoryReporter.h"
 #include "nsIObserverService.h"
 #include "nsIObserver.h"
+#include "nsIObjectOutputStream.h"
 #include "nsIOutputStream.h"
 #include "nsIFile.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/StaticPtr.h"
 #include "mozilla/UniquePtr.h"
 
 /**
@@ -104,7 +103,6 @@ class StartupCache : public nsIMemoryReporter
 {
 
 friend class StartupCacheListener;
-friend class StartupCacheWrapper;
 
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
@@ -200,24 +198,6 @@ class StartupCacheDebugOutputStream final
 };
 #endif // DEBUG
 
-// XPCOM wrapper interface provided for tests only.
-#define NS_STARTUPCACHE_CID \
-      {0xae4505a9, 0x87ab, 0x477c, \
-      {0xb5, 0x77, 0xf9, 0x23, 0x57, 0xed, 0xa8, 0x84}}
-// contract id: "@mozilla.org/startupcache/cache;1"
-
-class StartupCacheWrapper final
-  : public nsIStartupCache
-{
-  ~StartupCacheWrapper();
-
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSISTARTUPCACHE
-
-  static already_AddRefed<StartupCacheWrapper> GetSingleton();
-  static StartupCacheWrapper *gStartupCacheWrapper;
-};
-
 } // namespace scache
 } // namespace mozilla
 

startupcache/StartupCacheModule.cpp

@@ -33,7 +33,7 @@ NewObjectOutputWrappedStorageStream(nsIObjectOutputStream **wrapperStream,
 
 // Creates a buffer for storing the stream into the cache. The buffer is
 // allocated with 'new []'.  After calling this function, the caller would
-// typically call nsIStartupCache::PutBuffer with the returned buffer.
+// typically call StartupCache::PutBuffer with the returned buffer.
 nsresult
 NewBufferFromStorageStream(nsIStorageStream *storageStream,
                            UniquePtr<char[]>* buffer, uint32_t* len);

startupcache/StartupCacheUtils.h

@@ -9,20 +9,13 @@ with Files("**"):
 
 TEST_DIRS += ['test']
 
-XPIDL_SOURCES += [
-    'nsIStartupCache.idl',
-]
-
-XPIDL_MODULE = 'startupcache'
-
 EXPORTS.mozilla.scache += [
     'StartupCache.h',
     'StartupCacheUtils.h',
 ]
 
 UNIFIED_SOURCES += [
     'StartupCache.cpp',
-    'StartupCacheModule.cpp',
     'StartupCacheUtils.cpp',
 ]