Will the real BrowserProcessImpl please stand up?

Review URL: http://codereview.chromium.org/19743

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9030 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 122 insertions, 128 deletions

diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 7c25a78..e0824c4 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -12,6 +12,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_shutdown.h"
+#include "chrome/browser/first_run.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/profile_manager.h"
@@ -25,59 +26,6 @@
 // static
 size_t SessionRestore::num_tabs_to_load_ = 0;
 
-BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line)
-    : main_notification_service_(new NotificationService),
-      memory_model_(HIGH_MEMORY_MODEL),
-      created_local_state_(), created_metrics_service_(),
-      created_profile_manager_() {
-  g_browser_process = this;
-}
-
-BrowserProcessImpl::~BrowserProcessImpl() {
-  g_browser_process = NULL;
-}
-
-void BrowserProcessImpl::CreateLocalState() {
-  DCHECK(!created_local_state_ && local_state_.get() == NULL);
-  created_local_state_ = true;
-
-  std::wstring local_state_path;
-  PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
-  local_state_.reset(new PrefService(local_state_path));
-}
-
-void BrowserProcessImpl::CreateMetricsService() {
-  DCHECK(!created_metrics_service_ && metrics_service_.get() == NULL);
-  created_metrics_service_ = true;
-
-  metrics_service_.reset(new MetricsService);
-}
-
-void BrowserProcessImpl::CreateProfileManager() {
-  DCHECK(!created_profile_manager_ && profile_manager_.get() == NULL);
-  created_profile_manager_ = true;
-
-  profile_manager_.reset(new ProfileManager());
-}
-
-MetricsService* BrowserProcessImpl::metrics_service() {
-  if (!created_metrics_service_)
-    CreateMetricsService();
-  return metrics_service_.get();
-}
-
-ProfileManager* BrowserProcessImpl::profile_manager() {
-  if (!created_profile_manager_)
-    CreateProfileManager();
-  return profile_manager_.get();
-}
-
-PrefService* BrowserProcessImpl::local_state() {
-  if (!created_local_state_)
-    CreateLocalState();
-  return local_state_.get();
-}
-
 //--------------------------------------------------------------------------
 
 UserDataManager* UserDataManager::instance_ = NULL;
@@ -111,6 +59,33 @@ void Shutdown() { }
 void OnShutdownStarting(ShutdownType type) { }
 }
 
+
+// static
+bool FirstRun::IsChromeFirstRun() { return false; }
+
+// static
+bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
+                                        const FilePath& master_prefs_path,
+                                        int* preference_details) {
+  return false;
+}
+
+// static
+int FirstRun::ImportNow(Profile* profile, const CommandLine& cmdline) {
+  return 0;
+}
+
+// static
+bool Upgrade::IsBrowserAlreadyRunning() { return false; }
+
+// static
+bool Upgrade::RelaunchChromeBrowser(const CommandLine& command_line) {
+  return true;
+}
+
+// static
+bool Upgrade::SwapNewChromeExeIfPresent() { return true; }
+
 void OpenFirstRunDialog(Profile* profile) { }
 
 GURL NewTabUIURL() {
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 96f2b23..edc6b5c 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -13,12 +13,14 @@
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
+#include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/gfx/rect.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/tab_contents/tab_contents_type.h"
+#include "chrome/common/ipc_message.h"
 #include "chrome/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "skia/include/SkBitmap.h"
@@ -49,15 +51,6 @@ class WebContents;
 //---------------------------------------------------------------------------
 // These stubs are for Browser_main()
 
-class Upgrade {
- public:
-  static bool IsBrowserAlreadyRunning() { return false; }
-  static bool RelaunchChromeBrowser(const CommandLine& command_line) {
-    return true;
-  }
-  static bool SwapNewChromeExeIfPresent() { return true; }
-};
-
 // TODO(port): MessageWindow is very windows-specific, but provides the concept
 //             of singleton browser process per user-data-dir. Investigate how
 //             to achieve this on other platforms and see if this API works.
@@ -72,19 +65,6 @@ class MessageWindow {
   void Unlock() { }
 };
 
-class FirstRun {
- public:
-  static bool IsChromeFirstRun() { return false; }
-  static bool ProcessMasterPreferences(const FilePath& user_data_dir,
-                                       const FilePath& master_prefs_path,
-                                       int* preference_details) {
-    return false;
-  }
-  static int ImportNow(Profile* profile, const CommandLine& cmdline) {
-    return 0;
-  }
-};
-
 class GoogleUpdateSettings {
  public:
   static bool GetCollectStatsConsent() { return false; }
@@ -98,60 +78,9 @@ class GoogleUpdateSettings {
   DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings);
 };
 
-class BrowserProcessImpl : public BrowserProcess {
- public:
-  BrowserProcessImpl(const CommandLine& command_line);
-  virtual ~BrowserProcessImpl();
-
-  virtual void EndSession() { }
-  virtual ResourceDispatcherHost* resource_dispatcher_host() { return NULL; }
-  virtual MetricsService* metrics_service();
-  virtual ProfileManager* profile_manager();
-  virtual PrefService* local_state();
-  virtual DebuggerWrapper* debugger_wrapper() { return NULL; }
-  virtual ClipboardService* clipboard_service() { return NULL; }
-  virtual base::Thread* io_thread() { return NULL; }
-  virtual base::Thread* file_thread() { return NULL; }
-  virtual base::Thread* db_thread() { return NULL; }
-  virtual sandbox::BrokerServices* broker_services() { return NULL; }
-  virtual IconManager* icon_manager() { return NULL; }
-  virtual void InitBrokerServices(sandbox::BrokerServices*) { }
-  virtual AutomationProviderList* InitAutomationProviderList() { return NULL; }
-  virtual void InitDebuggerWrapper(int port) { }
-  virtual unsigned int AddRefModule() { return NULL; }
-  virtual unsigned int ReleaseModule() { return NULL; }
-  virtual bool IsShuttingDown() { return NULL; }
-  virtual views::AcceleratorHandler* accelerator_handler() { return NULL; }
-  virtual printing::PrintJobManager* print_job_manager() { return NULL; }
-  virtual GoogleURLTracker* google_url_tracker() { return NULL; }
-  virtual const std::wstring& GetApplicationLocale() { return locale_; }
-  virtual MemoryModel memory_model() { return MEDIUM_MEMORY_MODEL; }
-  virtual base::WaitableEvent* shutdown_event() { return NULL; }
- private:
-  void CreateLocalState();
-  void CreateProfileManager();
-  void CreateMetricsService();
-
-  scoped_ptr<NotificationService> main_notification_service_;
-  MemoryModel memory_model_;
-  bool created_local_state_;
-  scoped_ptr<PrefService> local_state_;
-  bool created_metrics_service_;
-  scoped_ptr<MetricsService> metrics_service_;
-  bool created_profile_manager_;
-  scoped_ptr<ProfileManager> profile_manager_;
-  std::wstring locale_;
-};
-
-class FirstRunBrowserProcess : public BrowserProcessImpl {
+class AutomationProviderList {
  public:
-  FirstRunBrowserProcess(const CommandLine& command_line)
-      : BrowserProcessImpl(command_line) {
-  }
-  virtual ~FirstRunBrowserProcess() { }
-  virtual GoogleURLTracker* google_url_tracker() { return NULL; }
- private:
-  DISALLOW_COPY_AND_ASSIGN(FirstRunBrowserProcess);
+  static AutomationProviderList* GetInstance() { return NULL; }
 };
 
 class UserDataManager {
@@ -236,6 +165,8 @@ class MetricsService {
   void StartRecordingOnly() { }
   void Stop() { }
   void SetUserPermitsUpload(bool enabled) { }
+  void RecordCleanShutdown() {}
+  void RecordStartOfSessionEnd() {}
 };
 
 namespace browser_shutdown {
@@ -254,6 +185,94 @@ void InstallJankometer(const CommandLine&);
 GURL NewTabUIURL();
 
 //---------------------------------------------------------------------------
+// These stubs are for BrowserProcessImpl
+
+class ClipboardService {
+};
+
+namespace printing {
+
+class PrintJobManager {
+ public:
+  void OnQuit() {}
+};
+
+}  // namespace printing
+
+class SafeBrowsingService
+    : public base::RefCountedThreadSafe<SafeBrowsingService> {
+ public:
+  void ShutDown() {}
+};
+
+class DownloadFileManager
+    : public base::RefCountedThreadSafe<DownloadFileManager> {
+ public:
+  void Shutdown() {}
+};
+
+class SaveFileManager : public base::RefCountedThreadSafe<SaveFileManager> {
+ public:
+  void Shutdown() {}
+};
+
+namespace sandbox {
+
+class BrokerServices {
+ public:
+  void Init() {}
+};
+  
+}  // namespace sandbox
+
+class IconManager {
+};
+
+struct ViewHostMsg_Resource_Request;
+
+class ResourceDispatcherHost {
+ public:
+  explicit ResourceDispatcherHost(MessageLoop* loop) {}
+  
+  class Receiver {
+   public:
+    virtual bool Send(IPC::Message* message) = 0;
+  };
+  
+  void Initialize() {}
+  void Shutdown() {}
+  
+  SafeBrowsingService* safe_browsing_service() {
+    return const_cast<SafeBrowsingService*>(&safe_browsing_service_);
+  }
+  
+  DownloadFileManager* download_file_manager() {
+    return const_cast<DownloadFileManager*>(&download_file_manager_);
+  }
+  
+  SaveFileManager* save_file_manager() {
+    return const_cast<SaveFileManager*>(&save_file_manager_);
+  }
+  
+ private:
+  SafeBrowsingService safe_browsing_service_;
+  DownloadFileManager download_file_manager_;
+  SaveFileManager save_file_manager_;
+};
+
+class DebuggerWrapper : public base::RefCountedThreadSafe<DebuggerWrapper> {
+ public:
+  explicit DebuggerWrapper(int port) {}
+};
+
+namespace views {
+  
+class AcceleratorHandler {
+};
+  
+}  // namespace views
+
+//---------------------------------------------------------------------------
 // These stubs are for Browser
 
 class SavePackage {