[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..50a76d19bd64cf939a091dedf09b1b25d2c46b5e 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -127,6 +127,8 @@ 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;
+  void set_storage_monitor_for_test(scoped_ptr<chrome::StorageMonitor> monitor);
   virtual chrome::MediaFileSystemRegistry*
       media_file_system_registry() OVERRIDE;
   virtual bool created_local_state() const OVERRIDE;
@@ -196,6 +198,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)

[sky, 2013/07/15 17:45:37]

Would it be clearer to have a feature define, eg:
if defined(STORAGE_MONITOR) ?

[Greg Billock, 2013/07/15 20:00:18]

That might be a good idea. We'll talk about doing that.

+  scoped_ptr<chrome::StorageMonitor> storage_monitor_;
 
   scoped_ptr<chrome::MediaFileSystemRegistry> media_file_system_registry_;
 #endif