Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(886)

Unified Diff: chrome/test/base/testing_browser_process.cc

Issue 16703025: [StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ea1469bd2989d1c45433cf31f894cc338a834ff6..a22b3c0d477b735b75ec5ae3fcb4a6415bc695a1 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -9,6 +9,7 @@
#include "build/build_config.h"
#include "chrome/browser/background/background_mode_manager.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_process_impl.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h"
#include "chrome/test/base/testing_browser_process_platform_part.h"
@@ -18,7 +19,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"
@@ -27,6 +27,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
@@ -314,9 +320,25 @@ BookmarkPromptController* TestingBrowserProcess::bookmark_prompt_controller() {
#endif
}
+chrome::StorageMonitor* TestingBrowserProcess::storage_monitor() {
+#if defined(OS_IOS) || defined(OS_ANDROID)
+ NOTIMPLEMENTED();
+ return NULL;
+#else
+ if (!storage_monitor_.get()) {
+ chrome::test::TestStorageMonitor* monitor =
+ new chrome::test::TestStorageMonitor();
+ monitor->Init();
+ monitor->MarkInitialized();
+ storage_monitor_.reset(monitor);
+ }
+ 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
@@ -392,3 +414,18 @@ 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
+}
+
+// static
+void TestingBrowserProcess::SetStorageMonitorForBrowserTests(
+ chrome::StorageMonitor* storage_monitor) {
+ BrowserProcessImpl* browser_process =
+ static_cast<BrowserProcessImpl*>(g_browser_process);
+ browser_process->SetStorageMonitorForTesting(storage_monitor);
+}
« chrome/test/base/testing_browser_process.h ('K') | « chrome/test/base/testing_browser_process.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698