Run the later parts of startup as UI thread tasks

content/browser/browser_main_runner.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/public/browser/browser_main_runner.h"
 
 #include "base/allocator/allocator_shim.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 22 matching lines @@
       : is_initialized_(false),
         is_shutdown_(false),
         created_threads_(false) {
   }
 
   virtual ~BrowserMainRunnerImpl() {
     if (is_initialized_ && !is_shutdown_)
       Shutdown();
   }
 
-  virtual int Initialize(const MainFunctionParams& parameters)
-      OVERRIDE {
+  virtual int Initialize(
+      const MainFunctionParams& parameters,
+      const scoped_refptr<StartupTaskRunner>& task_runner) OVERRIDE {

[Yaron, 2013/07/25 00:05:17]

Does this need to be a refptr? Couldn't ownership pass to BrowserMainRunnerImpl?

[aberent, 2013/07/26 20:36:54]

This has gone away due a restructuring following Jam's comments about the
content API.

     TRACE_EVENT0("startup", "BrowserMainRunnerImpl::Initialize")
     is_initialized_ = true;
 
 #if !defined(OS_IOS)
   if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
     base::debug::WaitForDebugger(60, true);
 #endif
 
 #if defined(OS_WIN)
     if (parameters.command_line.HasSwitch(
@@ skipping 40 matching lines @@
 
 #if defined(OS_WIN) && !defined(NO_TCMALLOC)
     // When linking shared libraries, NO_TCMALLOC is defined, and dynamic
     // allocator selection is not supported.
 
     // Make this call before going multithreaded, or spawning any subprocesses.
     base::allocator::SetupSubprocessAllocator();
 #endif
     ui::InitializeInputMethod();
 
-    main_loop_->CreateThreads();
+    main_loop_->CreateStartupTasks(task_runner);
     int result_code = main_loop_->GetResultCode();
     if (result_code > 0)
       return result_code;
     created_threads_ = true;
 
     // Return -1 to indicate no early termination.
     return -1;
   }
 
   virtual int Run() OVERRIDE {
@@ skipping 41 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl);
 };
 
 // static
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 }  // namespace content