| 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 300f192636ec098a418bc4fbd81945861107c00e..48290735b28c2a63b5912555e263c88297adfc2d 100644
|
| --- a/chrome/test/base/testing_browser_process.h
|
| +++ b/chrome/test/base/testing_browser_process.h
|
| @@ -103,6 +103,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;
|
| @@ -120,6 +121,7 @@ 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);
|
|
|
| private:
|
| scoped_ptr<content::NotificationService> notification_service_;
|
| @@ -142,10 +144,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_;
|
|
|