[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/browser_process_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // When each service is created, we set a flag indicating this. At this point,
 // the service initialization could fail or succeed. This allows us to remember
 // if we tried to create a service, and not try creating it over and over if
 // the creation failed.
 
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
@@ skipping 109 matching lines @@
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
   virtual void StartAutoupdateTimer() OVERRIDE;
 #endif
 
   virtual ChromeNetLog* net_log() OVERRIDE;
   virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE;
   virtual ComponentUpdateService* component_updater() OVERRIDE;
   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;
 #if defined(ENABLE_WEBRTC)
   virtual WebRtcLogUploader* webrtc_log_uploader() OVERRIDE;
 #endif
 
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
  private:
+  friend class TestingBrowserProcess;
+
   void CreateMetricsService();
   void CreateWatchdogThread();
   void CreateProfileManager();
   void CreateLocalState();
   void CreateViewedPageTracker();
   void CreateIconManager();
   void CreateIntranetRedirectDetector();
   void CreateNotificationUIManager();
   void CreateStatusTrayManager();
   void CreatePrintPreviewDialogController();
   void CreateBackgroundPrintingManager();
   void CreateSafeBrowsingService();
   void CreateSafeBrowsingDetectionService();
   void CreateStatusTray();
   void CreateBackgroundModeManager();
 
   void ApplyAllowCrossOriginAuthPromptPolicy();
   void ApplyDefaultBrowserPolicy();
 
+  void SetStorageMonitorForTesting(chrome::StorageMonitor* monitor);

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

I think we can make this public, just like
set_background_mode_manager_for_test() above that was recently added. Probably
should make it take a scoped_ptr for the same reason as
set_background_mode_manager_for_test() - make it clear that the
BrowserProcessImpl is taking ownership of the StorageMonitor.

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

Done.

+
   bool created_metrics_service_;
   scoped_ptr<MetricsService> metrics_service_;
 
   scoped_ptr<IOThread> io_thread_;
 
   bool created_watchdog_thread_;
   scoped_ptr<WatchDogThread> watchdog_thread_;
 
   bool created_browser_policy_connector_;
 #if defined(ENABLE_CONFIGURATION_POLICY)
@@ skipping 20 matching lines @@
   scoped_ptr<GpuModeManager> gpu_mode_manager_;
 
   scoped_refptr<extensions::EventRouterForwarder>
       extension_event_router_forwarder_;
 
 #if !defined(OS_ANDROID)
   scoped_ptr<RemoteDebuggingServer> remote_debugging_server_;
 
   // Bookmark prompt controller displays the prompt for frequently visited URL.
   scoped_ptr<BookmarkPromptController> bookmark_prompt_controller_;
+#endif
+
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+  scoped_ptr<chrome::StorageMonitor> storage_monitor_;
 
   scoped_ptr<chrome::MediaFileSystemRegistry> media_file_system_registry_;
 #endif
 
   scoped_refptr<printing::PrintPreviewDialogController>
       print_preview_dialog_controller_;
 
   scoped_ptr<printing::BackgroundPrintingManager> background_printing_manager_;
 
   scoped_ptr<chrome_variations::VariationsService> variations_service_;
@@ skipping 90 matching lines @@
 
 #if defined(ENABLE_WEBRTC)
   // Lazily initialized.
   scoped_ptr<WebRtcLogUploader> webrtc_log_uploader_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_