Revert 111695 - Have content/ create and destroy its own threads.

chrome/browser/browser_process_impl.h

 // Copyright (c) 2011 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_
 #define CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_member.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ipc/ipc_message.h"
 
 class BrowserOnlineStateObserver;
 class ChromeNetLog;
 class ChromeResourceDispatcherHostDelegate;
 class CommandLine;
-class ChromeFrameFriendOfBrowserProcessImpl;  // TODO(joi): Remove
 class RemoteDebuggingServer;
 class TabCloseableStateWatcher;
 
 namespace policy {
 class BrowserPolicyConnector;
 };
 
 // Real implementation of BrowserProcess that creates and returns the services.
 class BrowserProcessImpl : public BrowserProcess,
                            public base::NonThreadSafe,
                            public content::NotificationObserver {
  public:
   explicit BrowserProcessImpl(const CommandLine& command_line);
   virtual ~BrowserProcessImpl();
 
-  // Some of our startup is interleaved with thread creation, driven
-  // by these functions.
-  void PreStartThread(content::BrowserThread::ID identifier);
-  void PostStartThread(content::BrowserThread::ID identifier);
-
-  // Most cleanup is done by these functions, driven from
-  // ChromeBrowserMain based on notifications from the content
-  // framework, rather than in the destructor, so that we can
-  // interleave cleanup with threads being stopped.
-  void StartTearDown();
-  void PreStopThread(content::BrowserThread::ID identifier);
-  void PostStopThread(content::BrowserThread::ID identifier);
-
   base::Thread* process_launcher_thread();
 
   // BrowserProcess methods
   virtual void EndSession() OVERRIDE;
   virtual ResourceDispatcherHost* resource_dispatcher_host() OVERRIDE;
   virtual MetricsService* metrics_service() OVERRIDE;
   virtual IOThread* io_thread() OVERRIDE;
   virtual base::Thread* file_thread() OVERRIDE;
   virtual base::Thread* db_thread() OVERRIDE;
   virtual base::Thread* cache_thread() OVERRIDE;
@@ skipping 53 matching lines @@
 #endif
 
   virtual ChromeNetLog* net_log() OVERRIDE;
   virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE;
   virtual MHTMLGenerationManager* mhtml_generation_manager() OVERRIDE;
   virtual GpuBlacklistUpdater* gpu_blacklist_updater() OVERRIDE;
   virtual ComponentUpdateService* component_updater() OVERRIDE;
   virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
 
  private:
-  // TODO(joi): Remove. Temporary hack to get at CreateIOThreadState.
-  friend class ChromeFrameFriendOfBrowserProcessImpl;
-
-  // Must be called right before the IO thread is started.
-  void CreateIOThreadState();
-
   void CreateResourceDispatcherHost();
   void CreateMetricsService();
 
+  void CreateIOThread();
+  static void CleanupOnIOThread();
+
+  void CreateFileThread();
+  void CreateDBThread();
+  void CreateProcessLauncherThread();
+  void CreateCacheThread();
+  void CreateGpuThread();
   void CreateWatchdogThread();
 #if defined(OS_CHROMEOS)
-  void InitializeWebSocketProxyThread();
+  void CreateWebSocketProxyThread();
 #endif
   void CreateTemplateURLService();
   void CreateProfileManager();
   void CreateWebDataService();
   void CreateLocalState();
   void CreateViewedPageTracker();
   void CreateIconManager();
   void CreateSidebarManager();
   void CreateGoogleURLTracker();
   void CreateIntranetRedirectDetector();
@@ skipping 10 matching lines @@
   void ApplyDisabledSchemesPolicy();
   void ApplyAllowCrossOriginAuthPromptPolicy();
   void ApplyDefaultBrowserPolicy();
 
   bool created_resource_dispatcher_host_;
   scoped_ptr<ResourceDispatcherHost> resource_dispatcher_host_;
 
   bool created_metrics_service_;
   scoped_ptr<MetricsService> metrics_service_;
 
+  bool created_io_thread_;
   scoped_ptr<IOThread> io_thread_;
 
+  bool created_file_thread_;
+  scoped_ptr<base::Thread> file_thread_;
+
+  bool created_db_thread_;
+  scoped_ptr<base::Thread> db_thread_;
+
+  bool created_process_launcher_thread_;
+  scoped_ptr<base::Thread> process_launcher_thread_;
+
+  bool created_cache_thread_;
+  scoped_ptr<base::Thread> cache_thread_;
+
   bool created_watchdog_thread_;
   scoped_ptr<WatchDogThread> watchdog_thread_;
 
+#if defined(OS_CHROMEOS)
+  bool created_web_socket_proxy_thread_;
+  scoped_ptr<base::Thread> web_socket_proxy_thread_;
+#endif
+
   bool created_profile_manager_;
   scoped_ptr<ProfileManager> profile_manager_;
 
   bool created_local_state_;
   scoped_ptr<PrefService> local_state_;
 
   bool created_icon_manager_;
   scoped_ptr<IconManager> icon_manager_;
 
   scoped_refptr<ExtensionEventRouterForwarder>
@@ skipping 66 matching lines @@
   scoped_ptr<prerender::PrerenderTracker> prerender_tracker_;
 
   scoped_ptr<ChromeResourceDispatcherHostDelegate>
       resource_dispatcher_host_delegate_;
 
   content::NotificationRegistrar notification_registrar_;
 
   scoped_refptr<MHTMLGenerationManager> mhtml_generation_manager_;
 
   // Monitors the state of the 'DisablePluginFinder' policy.
-  scoped_ptr<BooleanPrefMember> plugin_finder_disabled_pref_;
+  BooleanPrefMember plugin_finder_disabled_pref_;
 
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
   base::RepeatingTimer<BrowserProcessImpl> autoupdate_timer_;
 
   // Gets called by autoupdate timer to see if browser needs restart and can be
   // restarted, and if that's the case, restarts the browser.
   void OnAutoupdateTimer();
   bool CanAutorestartForUpdate() const;
   void RestartBackgroundInstance();
 #endif  // defined(OS_WIN) || defined(OS_LINUX)
@@ skipping 10 matching lines @@
 #if !defined(OS_CHROMEOS)
   scoped_ptr<ComponentUpdateService> component_updater_;
 
   scoped_refptr<CRLSetFetcher> crl_set_fetcher_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_