Run the later parts of startup as UI thread tasks

content/browser/browser_main_loop.h

 // 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.
 
 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 
 #include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/browser_process_sub_thread.h"
+#include "content/public/browser/browser_main_runner.h"
 
 class CommandLine;
 
 namespace base {
 class HighResolutionTimerManager;
 class MessageLoop;
 class PowerMonitor;
 class SystemMonitor;
 namespace debug {
 class TraceMemoryController;
@@ skipping 37 matching lines @@
 
   explicit BrowserMainLoop(const MainFunctionParams& parameters);
   virtual ~BrowserMainLoop();
 
   void Init();
 
   void EarlyInitialization();
   void InitializeToolkit();
   void MainMessageLoopStart();
 
-  // Create all secondary threads.
-  void CreateThreads();
+  // Create the tasks we need to complete startup.
+  void CreateStartupTasks();
 
   // Perform the default message loop run logic.
   void RunMainMessageLoopParts();
 
   // Performs the shutdown sequence, starting with PostMainMessageLoopRun
   // through stopping threads to PostDestroyThreads.
   void ShutdownThreadsAndCleanUp();
 
   int GetResultCode() const { return result_code_; }
 
   media::AudioManager* audio_manager() const { return audio_manager_.get(); }
   AudioMirroringManager* audio_mirroring_manager() const {
     return audio_mirroring_manager_.get();
   }
   MediaStreamManager* media_stream_manager() const {
     return media_stream_manager_.get();
   }
   media::MIDIManager* midi_manager() const { return midi_manager_.get(); }
   base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); }
 
  private:
   class MemoryObserver;
   // For ShutdownThreadsAndCleanUp.
   friend class BrowserShutdownImpl;
 
   void InitializeMainThread();
 
+  // Called just before creating the threads
+  int PreCreateThreads();
+
+  // Create all secondary threads.
+  int CreateThreads();
+
   // Called right after the browser threads have been started.
-  void BrowserThreadsStarted();
+  int BrowserThreadsStarted();
+
+  int PreMainMessageLoopRun();
 
   void MainMessageLoopRun();
 
   // Members initialized on construction ---------------------------------------
   const MainFunctionParams& parameters_;
   const CommandLine& parsed_command_line_;
   int result_code_;
+  // True if the non-UI threads were created.
+  bool created_threads_;
 
   // Members initialized in |MainMessageLoopStart()| ---------------------------
   scoped_ptr<base::MessageLoop> main_message_loop_;
   scoped_ptr<base::SystemMonitor> system_monitor_;
   scoped_ptr<base::PowerMonitor> power_monitor_;
   scoped_ptr<base::HighResolutionTimerManager> hi_res_timer_manager_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<media::AudioManager> audio_manager_;
   scoped_ptr<media::MIDIManager> midi_manager_;
   scoped_ptr<AudioMirroringManager> audio_mirroring_manager_;
@@ skipping 30 matching lines @@
   scoped_ptr<base::Thread> indexed_db_thread_;
   scoped_ptr<MemoryObserver> memory_observer_;
   scoped_ptr<base::debug::TraceMemoryController> trace_memory_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_