Get content_browsertest working. I've added a simple test for now, and will convert the tests in sr…

content/shell/shell_browser_main_parts.h

Index: content/shell/shell_browser_main_parts.h
===================================================================
--- content/shell/shell_browser_main_parts.h	(revision 147044)
+++ content/shell/shell_browser_main_parts.h	(working copy)
@@ -21,14 +21,15 @@
 
 class ShellBrowserMainParts : public BrowserMainParts {
  public:
-  explicit ShellBrowserMainParts(const content::MainFunctionParams& parameters);
+  explicit ShellBrowserMainParts(const MainFunctionParams& parameters);
   virtual ~ShellBrowserMainParts();
 
-  // content::BrowserMainParts overrides.
+  // BrowserMainParts overrides.
   virtual void PreEarlyInitialization() OVERRIDE;
   virtual void PreMainMessageLoopStart() OVERRIDE;
   virtual void PostMainMessageLoopStart() OVERRIDE;
   virtual void PreMainMessageLoopRun() OVERRIDE;
+  virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
   virtual void PostMainMessageLoopRun() OVERRIDE;
 
   ShellDevToolsDelegate* devtools_delegate() { return devtools_delegate_; }
@@ -38,6 +39,10 @@
  private:
   scoped_ptr<ShellBrowserContext> browser_context_;
 
+  // For running content_browsertests.
+  const MainFunctionParams& parameters_;
+  bool run_message_loop_;
+
   ShellDevToolsDelegate* devtools_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);