[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/storage_monitor.h

Index: chrome/browser/storage_monitor/storage_monitor.h
diff --git a/chrome/browser/storage_monitor/storage_monitor.h b/chrome/browser/storage_monitor/storage_monitor.h
index 5661c80fb5e9252682528a16d2c4038105f2154a..0705bf92798c83e0a0c96cf2e0c902e3b7f8efbf 100644
--- a/chrome/browser/storage_monitor/storage_monitor.h
+++ b/chrome/browser/storage_monitor/storage_monitor.h
@@ -68,10 +68,16 @@ class StorageMonitor {
     EJECT_FAILURE
   };
 
+  // Returns a pointer to a created per-platform object with the StorageMonitor
+  // interface.
+  static StorageMonitor* Create();
+
   // Returns a pointer to an object owned by the BrowserMainParts, with lifetime

[Lei Zhang, 2013/07/02 23:16:57]

update comment

[Greg Billock, 2013/07/03 17:49:17]

Done.

   // somewhat shorter than a process Singleton.
   static StorageMonitor* GetInstance();
 
+  StorageMonitor();
+  virtual ~StorageMonitor();

[Lei Zhang, 2013/07/02 23:16:57]

nit: blank line after

[Greg Billock, 2013/07/03 17:49:17]

Done.

   // Ensures that the storage monitor is initialized. The provided callback, If
   // non-null, will be called when initialization is complete. If initialization
   // has already completed, this callback will be invoked within the calling
@@ -131,13 +137,6 @@ class StorageMonitor {
   friend class MediaFileSystemRegistryTest;
   friend class ::SystemInfoStorageApiTest;
 
-  StorageMonitor();
-  virtual ~StorageMonitor();
-
-  // Removes the existing singleton for testing.
-  // (So that a new one can be created.)
-  static void RemoveSingletonForTesting();
-
   virtual Receiver* receiver() const;
 
   // Called to initialize the storage monitor.