[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/test/base/testing_browser_process.cc

Index: chrome/test/base/testing_browser_process.cc
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index 3fe39f2b10b3fe38ba1e2348c2b7eac19595f1bf..f635897faf4741f05a8140670b6567d42f164780 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -17,7 +17,6 @@
 #include "ui/message_center/message_center.h"
 
 #if !defined(OS_IOS)
-#include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/printing/background_printing_manager.h"
@@ -26,6 +25,12 @@
 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h"
 #endif
 
+#if !defined(OS_IOS) && !defined(OS_ANDROID)
+#include "chrome/browser/media_galleries/media_file_system_registry.h"
+#include "chrome/browser/storage_monitor/storage_monitor.h"
+#include "chrome/browser/storage_monitor/test_storage_monitor.h"
+#endif
+
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/browser_policy_connector.h"
 #else
@@ -44,6 +49,9 @@ TestingBrowserProcess::TestingBrowserProcess()
 #if !defined(OS_IOS)
       render_widget_snapshot_taker_(new RenderWidgetSnapshotTaker),
 #endif
+#if !defined(OS_IOS) && !defined(OS_ANDROID)
+      storage_monitor_(new chrome::test::TestStorageMonitor),

[Lei Zhang, 2013/06/27 00:09:38]

What's preventing this from only being created when storage_monitor() is called?

[Greg Billock, 2013/06/27 18:25:43]

Nothing. I can do that.

+#endif
       local_state_(NULL),
       io_thread_(NULL),
       system_request_context_(NULL),
@@ -308,9 +316,18 @@ BookmarkPromptController* TestingBrowserProcess::bookmark_prompt_controller() {
 #endif
 }
 
+chrome::StorageMonitor* TestingBrowserProcess::storage_monitor() {
+#if defined(OS_IOS) || defined(OS_ANDROID)
+  NOTIMPLEMENTED();
+  return NULL;
+#else
+  return storage_monitor_.get();
+#endif
+}
+
 chrome::MediaFileSystemRegistry*
 TestingBrowserProcess::media_file_system_registry() {
-#if defined(OS_IOS) || defined (OS_ANDROID)
+#if defined(OS_IOS) || defined(OS_ANDROID)
   NOTIMPLEMENTED();
   return NULL;
 #else
@@ -386,3 +403,10 @@ void TestingBrowserProcess::SetSafeBrowsingService(
   sb_service_ = sb_service;
 #endif
 }
+
+void TestingBrowserProcess::SetStorageMonitor(
+    chrome::StorageMonitor* storage_monitor) {
+#if !defined(OS_IOS) && !defined(OS_ANDROID)
+  storage_monitor_.reset(storage_monitor);
+#endif
+}