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 11 matching lines @@
 #include "base/win/windows_version.h"
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 bool g_exited_main_message_loop = false;
 
 namespace content {
 
 class BrowserMainRunnerImpl : public BrowserMainRunner {
  public:
-  BrowserMainRunnerImpl()
-      : is_initialized_(false),
-        is_shutdown_(false),
-        created_threads_(false) {
-  }
+  BrowserMainRunnerImpl() : is_initialized_(false), is_shutdown_(false) {}
 
   virtual ~BrowserMainRunnerImpl() {
     if (is_initialized_ && !is_shutdown_)
       Shutdown();
   }
 
   virtual int Initialize(const MainFunctionParams& parameters)
       OVERRIDE {
     TRACE_EVENT0("startup", "BrowserMainRunnerImpl::Initialize")
     is_initialized_ = true;
@@ skipping 48 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();
     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 {
     DCHECK(is_initialized_);
     DCHECK(!is_shutdown_);
     main_loop_->RunMainMessageLoopParts();
     return main_loop_->GetResultCode();
   }
 
   virtual void Shutdown() OVERRIDE {
     DCHECK(is_initialized_);
     DCHECK(!is_shutdown_);
     g_exited_main_message_loop = true;
 
-    if (created_threads_)
-      main_loop_->ShutdownThreadsAndCleanUp();
+    main_loop_->ShutdownThreadsAndCleanUp();
 
     ui::ShutdownInputMethod();
 #if defined(OS_WIN)
     ole_initializer_.reset(NULL);
 #endif
 
     main_loop_.reset(NULL);
 
     notification_service_.reset(NULL);
 
     is_shutdown_ = true;
   }
 
  protected:
   // True if the runner has been initialized.
   bool is_initialized_;
 
   // True if the runner has been shut down.
   bool is_shutdown_;
 
-  // True if the non-UI threads were created.
-  bool created_threads_;
-
   scoped_ptr<NotificationServiceImpl> notification_service_;
   scoped_ptr<BrowserMainLoop> main_loop_;
 #if defined(OS_WIN)
   scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl);
 };
 
 // static
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 }  // namespace content