[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/test_storage_monitor.h

 // Copyright (c) 2013 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_TEST_STORAGE_MONITOR_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_
 
 #include <string>
 
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 
 namespace chrome {
 namespace test {
 
 class TestStorageMonitor : public chrome::StorageMonitor {
  public:
   TestStorageMonitor();
   virtual ~TestStorageMonitor();
 
   virtual void Init() OVERRIDE;
 
   void MarkInitialized();
 
-  // Will create a new testing implementation for browser tests,
-  // taking care to deal with the existing singleton correctly.
+  // Create and initialize a new TestStorageMonitor and install it
+  // in the TestingBrowserProcess.
+  static TestStorageMonitor* CreateAndInstall();
+
+  // Create and initialize a new TestStorageMonitor, and install it
+  // in the BrowserProcessImpl. (Browser tests use the production browser
+  // process implementation.)
   static TestStorageMonitor* CreateForBrowserTests();
 
+  // Remove the singleton StorageMonitor from the TestingBrowserProcess.
+  static void RemoveSingleton();
+
+  // Synchronously initialize the current storage monitor.
+  static void SyncInitialize();
+
   virtual bool GetStorageInfoForPath(
       const base::FilePath& path,
       StorageInfo* device_info) const OVERRIDE;
 
 #if defined(OS_WIN)
   virtual bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       string16* device_location,
       string16* storage_object_id) const OVERRIDE;
 #endif
@@ skipping 20 matching lines @@
 #if defined(OS_LINUX)
   scoped_ptr<device::MediaTransferProtocolManager>
       media_transfer_protocol_manager_;
 #endif
 };
 
 }  // namespace test
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_