Revert 121236 - Support sharing of ContentMain and BrowserMain code with embedded use cases (try ...

content/browser/browser_main_loop.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/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 272 matching lines @@
   // has already been initialized.
   if (!parameters_.ui_task) {
     // Override the configured locale with the user's preferred UI language.
     l10n_util::OverrideLocaleWithUILanguageList();
   }
 #endif
 
   // Must first NULL pointer or we hit a DCHECK that the newly constructed
   // message loop is the current one.
   main_message_loop_.reset();
-  main_message_loop_.reset(parts_->GetMainMessageLoop());
-  if (!main_message_loop_.get())
-    main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
+  main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
 
   InitializeMainThread();
 
   // Start tracing to a file if needed.
   if (base::debug::TraceLog::GetInstance()->IsEnabled())
     TraceController::GetInstance()->InitStartupTracing(parsed_command_line_);
 
   system_monitor_.reset(new base::SystemMonitor);
   hi_res_timer_manager_.reset(new HighResolutionTimerManager);
 
   network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
 
 #if defined(OS_WIN)
   system_message_window_.reset(new SystemMessageWindowWin);
 #endif
 
   // Prior to any processing happening on the io thread, we create the
   // plugin service as it is predominantly used from the io thread,
   // but must be created on the main thread. The service ctor is
   // inexpensive and does not invoke the io_thread() accessor.
   PluginService::GetInstance()->Init();
 
   if (parts_.get())
     parts_->PostMainMessageLoopStart();
 }
 
-void BrowserMainLoop::CreateThreads() {
+void BrowserMainLoop::RunMainMessageLoopParts(
+    bool* completed_main_message_loop) {
   if (parts_.get())
     result_code_ = parts_->PreCreateThreads();
 
   if (result_code_ > 0)
     return;
 
   base::Thread::Options default_options;
   base::Thread::Options io_message_loop_options;
   io_message_loop_options.message_loop_type = MessageLoop::TYPE_IO;
   base::Thread::Options ui_message_loop_options;
@@ skipping 61 matching lines @@
     } else {
       NOTREACHED();
     }
   }
 
   BrowserThreadsStarted();
 
   if (parts_.get())
     parts_->PreMainMessageLoopRun();
 
+  TRACE_EVENT_BEGIN_ETW("BrowserMain:MESSAGE_LOOP", 0, "");
   // If the UI thread blocks, the whole UI is unresponsive.
   // Do not allow disk IO from the UI thread.
   base::ThreadRestrictions::SetIOAllowed(false);
-}
-
-void BrowserMainLoop::RunMainMessageLoopParts() {
-  TRACE_EVENT_BEGIN_ETW("BrowserMain:MESSAGE_LOOP", 0, "");
 
   bool ran_main_loop = false;
   if (parts_.get())
     ran_main_loop = parts_->MainMessageLoopRun(&result_code_);
 
   if (!ran_main_loop)
     MainMessageLoopRun();
 
   TRACE_EVENT_END_ETW("BrowserMain:MESSAGE_LOOP", 0, "");
+
+  if (completed_main_message_loop)
+    *completed_main_message_loop = true;
+
+  ShutdownThreadsAndCleanUp();
 }
 
 void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
   // Teardown may start in PostMainMessageLoopRun, and during teardown we
   // need to be able to perform IO.
   base::ThreadRestrictions::SetIOAllowed(true);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(base::IgnoreResult(&base::ThreadRestrictions::SetIOAllowed),
                  true));
@@ skipping 168 matching lines @@
     MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task);
 
 #if defined(OS_MACOSX)
   MessageLoopForUI::current()->Run();
 #else
   MessageLoopForUI::current()->RunWithDispatcher(NULL);
 #endif
 }
 
 }  // namespace content