[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 18 matching lines @@
 }
 
 namespace chrome {
 
 class MediaFileSystemRegistryTest;
 class RemovableStorageObserver;
 class TransientDeviceIds;
 
 // Base class for platform-specific instances watching for removable storage
 // attachments/detachments.
-// Lifecycle contracts: This class is created by ChromeBrowserMain
-// implementations before the profile is initialized, so listeners can be
+// Lifecycle contracts: This class is created in the browser process
+// before the profile is initialized, so listeners can be
 // created during profile construction. The platform-specific initialization,
 // which can lead to calling registered listeners with notifications of
 // attached volumes, are done lazily at first use through the async
 // |Initialize()| method. That must be done before any of the registered
 // listeners will receive updates or calls to other API methods return
 // meaningful results.
 // A post-initialization |GetAttachedStorage()| call coupled with a
 // registered listener will receive a complete set, albeit potentially with
 // duplicates. This is because there's no tracking between when listeners were
 // registered and the state of initialization, and the fact that platforms
@@ skipping 11 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 newly 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. Called outside it's lifetime (or with no browser process),
+  // returns NULL.
   static StorageMonitor* GetInstance();
 
+  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 41 matching lines @@
 
  protected:
   friend class ::MediaGalleriesPlatformAppBrowserTest;
   friend class ::MediaGalleriesPrivateApiTest;
   friend class ::MediaGalleriesPrivateEjectApiTest;
   friend class MediaFileSystemRegistryTest;
   friend class ::SystemInfoStorageApiTest;
   friend class ::SystemInfoStorageEjectApiTest;
 
   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();
 
@@ skipping 24 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_