Fix content_shell. We really need an automated test soon :)

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

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

content/shell/shell_browser_main.cc

@@ -12,6 +12,7 @@
 #include "content/browser/browser_process_sub_thread.h"
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/save_file_manager.h"
+#include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
@@ -42,11 +43,12 @@ ShellBrowserMainParts::ShellBrowserMainParts(
 ShellBrowserMainParts::~ShellBrowserMainParts() {
 }
 
-void ShellBrowserMainParts::PreCreateThreads() {
+void ShellBrowserMainParts::PreMainMessageLoopRun() {
   browser_context_.reset(new ShellBrowserContext(this));
 
   Shell::PlatformInitialize();
   net::NetModule::SetResourceProvider(Shell::PlatformResourceProvider);
+  PluginService::GetInstance()->Init();
 
   Shell::CreateNewWindow(browser_context_.get(),
                          GetStartupURL(),

content/shell/shell_browser_main.h

@@ -35,10 +35,10 @@ class ShellBrowserMainParts : public BrowserMainParts {
   virtual void PreMainMessageLoopStart() OVERRIDE {}
   virtual void ToolkitInitialized() OVERRIDE {}
   virtual void PostMainMessageLoopStart() OVERRIDE {}
-  virtual void PreCreateThreads() 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;