[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/storage_monitor.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 50 matching lines @@
   };
 
   // Status codes for the result of an EjectDevice() call.
   enum EjectStatus {
     EJECT_OK,
     EJECT_IN_USE,
     EJECT_NO_SUCH_DEVICE,
     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
   // stack. Before the callback is run, calls to |GetAllAvailableStorages| and
   // |GetStorageInfoForPath| may not return the correct results. In addition,
   // registered observers will not be notified on device attachment/detachment.
   // Should be invoked on the UI thread; callbacks will be run on the UI thread.
   void EnsureInitialized(base::Closure callback);
 
   // Return true if the storage monitor has already been initialized.
@@ skipping 39 matching lines @@
       const std::string& device_id,
       base::Callback<void(EjectStatus)> callback);
 
  protected:
   friend class ::MediaGalleriesPlatformAppBrowserTest;
   friend class ::MediaGalleriesPrivateApiTest;
   friend class ::MediaGalleriesPrivateEjectApiTest;
   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.
   virtual void Init() = 0;
 
   // Called by subclasses to mark the storage monitor as
   // fully initialized. Must be called on the UI thread.
   void MarkInitialized();
 
  private:
@@ skipping 23 matching lines @@
 
   // Map of all known storage devices,including fixed and removable storages.
   StorageMap storage_map_;
 
   scoped_ptr<TransientDeviceIds> transient_device_ids_;
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_