[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..f48b2e80e0cda3ce154b9db90058a1a6b545fa46 100644
--- a/chrome/browser/storage_monitor/storage_monitor.h
+++ b/chrome/browser/storage_monitor/storage_monitor.h
@@ -68,10 +68,18 @@ class StorageMonitor {
     EJECT_FAILURE
   };
 
-  // Returns a pointer to an object owned by the BrowserMainParts, with lifetime
-  // somewhat shorter than a process Singleton.
+  // Returns a pointer to a created per-platform object with the StorageMonitor
+  // interface.
+  static StorageMonitor* Create();
+
+  // Returns a pointer to an object owned by BrowserProcess, with lifetime
+  // starting before main message loop start, and ending after main message loop
+  // shutdown.
   static StorageMonitor* GetInstance();
 
+  StorageMonitor();

[Lei Zhang, 2013/07/03 23:25:10]

The ctor should be protected, so one has to use GetInstance()

[Greg Billock, 2013/07/08 18:50:07]

Done. Shall I move Create() and friend needed classes as well? Or just leave it?

+  virtual ~StorageMonitor();
+
   // 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 +139,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.