[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/test/base/testing_browser_process.h

Index: chrome/test/base/testing_browser_process.h
diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h
index 983d76654124dc40723b304b12037059d2bae7a9..2154756ea58ede9af48ade7185a0106dfbb12b87 100644
--- a/chrome/test/base/testing_browser_process.h
+++ b/chrome/test/base/testing_browser_process.h
@@ -105,6 +105,7 @@ class TestingBrowserProcess : 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;
@@ -122,6 +123,10 @@ class TestingBrowserProcess : public BrowserProcess {
   void SetSafeBrowsingService(SafeBrowsingService* sb_service);
   void SetBookmarkPromptController(BookmarkPromptController* controller);
   void SetSystemRequestContext(net::URLRequestContextGetter* context_getter);
+  void SetStorageMonitor(chrome::StorageMonitor* storage_monitor);
+
+  static void SetStorageMonitorForBrowserTests(

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

I don't think we need this. Just put SetStorageMonitorForTesting() in
browser_process.h, and callers can call
g_browser_process->SetStorageMonitorForTesting() directly.

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

I'd like to keep the testing interface out of browser_process.h

I'll add a comment though.

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

set_background_mode_manager_for_test() already exists in browser_process.h. Do
you thinking adding set_storage_monitor_for_test() would help simplify the code
at the expense of adding a test method to the public interface?

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

Yeah, I saw that. I don't think it simplifies that much, though.

+      chrome::StorageMonitor* storage_monitor);
 
  private:
   scoped_ptr<content::NotificationService> notification_service_;
@@ -144,10 +149,12 @@ class TestingBrowserProcess : public BrowserProcess {
   scoped_ptr<RenderWidgetSnapshotTaker> render_widget_snapshot_taker_;
   scoped_refptr<SafeBrowsingService> sb_service_;
   scoped_ptr<BookmarkPromptController> bookmark_prompt_controller_;
-#if !defined(OS_ANDROID)
+#endif  // !defined(OS_IOS)
+
+#if !defined(OS_IOS) && !defined(OS_ANDROID)
+  scoped_ptr<chrome::StorageMonitor> storage_monitor_;
   scoped_ptr<chrome::MediaFileSystemRegistry> media_file_system_registry_;
 #endif
-#endif  // !defined(OS_IOS)
 
   // The following objects are not owned by TestingBrowserProcess:
   PrefService* local_state_;