Run the later parts of startup as UI thread tasks

content/shell/shell_browser_main.cc

 // Copyright (c) 2012 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.
 
 #include "content/shell/shell_browser_main.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_main_runner.h"
+#include "content/public/common/startup_task_runner.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/common/webkit_test_helpers.h"
 #include "content/shell/shell.h"
 #include "content/shell/webkit_test_controller.h"
 #include "net/base/net_util.h"
 #include "webkit/support/webkit_support.h"
 
 #if defined(OS_ANDROID)
 #include "base/run_loop.h"
 #include "content/shell/shell_layout_tests_android.h"
@@ skipping 90 matching lines @@
     CHECK(browser_context_path_for_layout_tests.CreateUniqueTempDir());
     CHECK(!browser_context_path_for_layout_tests.path().MaybeAsASCII().empty());
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kContentShellDataPath,
         browser_context_path_for_layout_tests.path().MaybeAsASCII());
 
 #if defined(OS_ANDROID)
     content::EnsureInitializeForAndroidLayoutTests();
 #endif
   }
+  scoped_refptr<content::StartupTaskRunner> startup_task_runner =
+      make_scoped_refptr(new content::StartupTaskRunner(
+          content::StartupTaskRunner::IMMEDIATE, NULL));
 
-  int exit_code = main_runner->Initialize(parameters);
+  int exit_code = main_runner->Initialize(parameters, startup_task_runner);
   DCHECK_LT(exit_code, 0)
       << "BrowserMainRunner::Initialize failed in ShellBrowserMain";
 
   if (exit_code >= 0)
     return exit_code;
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kCheckLayoutTestSysDeps)) {
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::MessageLoop::QuitClosure());
@@ skipping 63 matching lines @@
 
 #if !defined(OS_ANDROID)
   if (!layout_test_mode)
     exit_code = main_runner->Run();
 
   main_runner->Shutdown();
 #endif
 
   return exit_code;
 }