[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/browser_process_impl.h

Index: chrome/browser/browser_process_impl.h
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 66191dc724f9cdfe2d14d2202d29f04536e0268f..b4dad4507578fe4c439fdb063e9bbf016b40da47 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -127,6 +127,7 @@ class BrowserProcessImpl : public BrowserProcess,
   virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
   virtual PnaclComponentInstaller* pnacl_component_installer() OVERRIDE;
   virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
+  virtual chrome::StorageMonitor* storage_monitor() OVERRIDE;
   virtual chrome::MediaFileSystemRegistry*
       media_file_system_registry() OVERRIDE;
   virtual bool created_local_state() const OVERRIDE;
@@ -137,6 +138,8 @@ class BrowserProcessImpl : public BrowserProcess,
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
  private:
+  friend class TestingBrowserProcess;
+
   void CreateMetricsService();
   void CreateWatchdogThread();
   void CreateProfileManager();
@@ -156,6 +159,8 @@ class BrowserProcessImpl : public BrowserProcess,
   void ApplyAllowCrossOriginAuthPromptPolicy();
   void ApplyDefaultBrowserPolicy();
 
+  void SetStorageMonitorForTesting(chrome::StorageMonitor* monitor);

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

I think we can make this public, just like
set_background_mode_manager_for_test() above that was recently added. Probably
should make it take a scoped_ptr for the same reason as
set_background_mode_manager_for_test() - make it clear that the
BrowserProcessImpl is taking ownership of the StorageMonitor.

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

Done.

+
   bool created_metrics_service_;
   scoped_ptr<MetricsService> metrics_service_;
 
@@ -196,6 +201,10 @@ class BrowserProcessImpl : public BrowserProcess,
 
   // Bookmark prompt controller displays the prompt for frequently visited URL.
   scoped_ptr<BookmarkPromptController> bookmark_prompt_controller_;
+#endif
+
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+  scoped_ptr<chrome::StorageMonitor> storage_monitor_;
 
   scoped_ptr<chrome::MediaFileSystemRegistry> media_file_system_registry_;
 #endif