[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/test/base/testing_browser_process.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.
 
 // An implementation of BrowserProcess for unit tests that fails for most
 // services. By preventing creation of services, we reduce dependencies and
 // keep the profile clean. Clients of this class must handle the NULL return
 // value, however.
 
 #ifndef CHROME_TEST_BASE_TESTING_BROWSER_PROCESS_H_
@@ skipping 87 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
 
   // Set the local state for tests. Consumer is responsible for cleaning it up
   // afterwards (using ScopedTestingLocalState, for example).
   void SetLocalState(PrefService* local_state);
   void SetProfileManager(ProfileManager* profile_manager);
   void SetIOThread(IOThread* io_thread);
   void SetBrowserPolicyConnector(policy::BrowserPolicyConnector* connector);
   void SetSafeBrowsingService(SafeBrowsingService* sb_service);
   void SetBookmarkPromptController(BookmarkPromptController* controller);
   void SetSystemRequestContext(net::URLRequestContextGetter* context_getter);
+  void SetStorageMonitor(chrome::StorageMonitor* storage_monitor);
+
+  static void SetStorageMonitorForBrowserTests(

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

I don't think we need this. Just put SetStorageMonitorForTesting() in
browser_process.h, and callers can call
g_browser_process->SetStorageMonitorForTesting() directly.

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

I'd like to keep the testing interface out of browser_process.h

I'll add a comment though.

[Lei Zhang, 2013/07/03 23:25:10]

set_background_mode_manager_for_test() already exists in browser_process.h. Do
you thinking adding set_storage_monitor_for_test() would help simplify the code
at the expense of adding a test method to the public interface?

[Greg Billock, 2013/07/08 18:50:07]

Yeah, I saw that. I don't think it simplifies that much, though.

+      chrome::StorageMonitor* storage_monitor);
 
  private:
   scoped_ptr<content::NotificationService> notification_service_;
   unsigned int module_ref_count_;
   std::string app_locale_;
 
   // TODO(ios): Add back members as more code is compiled.
 #if !defined(OS_IOS)
 #if defined(ENABLE_CONFIGURATION_POLICY)
   scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_;
 #else
   scoped_ptr<policy::PolicyService> policy_service_;
 #endif
   scoped_ptr<ProfileManager> profile_manager_;
   scoped_ptr<NotificationUIManager> notification_ui_manager_;
   scoped_ptr<printing::BackgroundPrintingManager> background_printing_manager_;
   scoped_refptr<printing::PrintPreviewDialogController>
       print_preview_dialog_controller_;
   scoped_ptr<prerender::PrerenderTracker> prerender_tracker_;
   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_;
   IOThread* io_thread_;
   net::URLRequestContextGetter* system_request_context_;
 
   scoped_ptr<BrowserProcessPlatformPart> platform_part_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcess);
 };
 
 #endif  // CHROME_TEST_BASE_TESTING_BROWSER_PROCESS_H_