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.cc

Index: content/shell/shell_browser_main_parts.cc
===================================================================
--- content/shell/shell_browser_main_parts.cc	(revision 147044)
+++ content/shell/shell_browser_main_parts.cc	(working copy)
@@ -11,6 +11,7 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/main_function_params.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_devtools_delegate.h"
@@ -37,6 +38,8 @@
 ShellBrowserMainParts::ShellBrowserMainParts(
     const content::MainFunctionParams& parameters)
     : BrowserMainParts(),
+      parameters_(parameters),
+      run_message_loop_(true),
       devtools_delegate_(NULL) {
 }
 
@@ -88,8 +91,18 @@
                            MSG_ROUTING_NONE,
                            NULL);
   }
+
+  if (parameters_.ui_task) {
+    parameters_.ui_task->Run();
+    delete parameters_.ui_task;
+    run_message_loop_ = false;
+  }
 }
 
+bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code)  {
+  return !run_message_loop_;
+}
+
 void ShellBrowserMainParts::PostMainMessageLoopRun() {
   if (devtools_delegate_)
     devtools_delegate_->Stop();