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

Reason: Problems on official builders.

Change embedding API and embedders to allow for this.

Push inheritance of base::Thread down to content::BrowserThreadImpl so
that content::BrowserThread is just a namespace for API functions.

This change temporarily disables chrome_frame_net_tests as agreed by the CF lead, see bug 105435.

TBR=ben@chromium.org (IWYU change only)
BUG=98716,104578,105435

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

TBR=joi@chromium.org
Review URL: http://codereview.chromium.org/8718012

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

1 files changed, 11 insertions, 8 deletions

diff --git a/content/shell/shell_browser_main.h b/content/shell/shell_browser_main.h
index ffa44e6..0e617ca 100644
--- a/content/shell/shell_browser_main.h
+++ b/content/shell/shell_browser_main.h
@@ -35,25 +35,28 @@ class ShellBrowserMainParts : public BrowserMainParts {
   virtual void PreMainMessageLoopStart() OVERRIDE {}
   virtual void ToolkitInitialized() OVERRIDE {}
   virtual void PostMainMessageLoopStart() OVERRIDE {}
-  virtual void PreCreateThreads() OVERRIDE;
-  virtual void PreStartThread(BrowserThread::ID id) OVERRIDE {}
-  virtual void PostStartThread(BrowserThread::ID id) OVERRIDE {}
-  virtual void PreMainMessageLoopRun() OVERRIDE {}
+  virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
-  virtual void PostMainMessageLoopRun() OVERRIDE;
-  virtual void PreStopThread(BrowserThread::ID id) OVERRIDE;
-  virtual void PostStopThread(BrowserThread::ID) OVERRIDE {}
-  virtual void PostDestroyThreads() OVERRIDE {}
+  virtual void PostMainMessageLoopRun() OVERRIDE {}
 
   ResourceDispatcherHost* GetResourceDispatcherHost();
   ui::Clipboard* GetClipboard();
 
+  base::Thread* io_thread() { return io_thread_.get(); }
+  base::Thread* file_thread() { return file_thread_.get(); }
+
  private:
   scoped_ptr<ShellBrowserContext> browser_context_;
 
   scoped_ptr<ResourceDispatcherHost> resource_dispatcher_host_;
   scoped_ptr<ui::Clipboard> clipboard_;
 
+  scoped_ptr<base::Thread> io_thread_;
+  scoped_ptr<base::Thread> file_thread_;
+  scoped_ptr<base::Thread> db_thread_;
+  scoped_ptr<base::Thread> process_launcher_thread_;
+  scoped_ptr<base::Thread> cache_thread_;
+
   DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
 };