Revert 110710 - Add ChromeBrowserMainExtraParts for non main parts.

content/browser/browser_main_loop.cc

 // Copyright (c) 2011 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/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 140 matching lines @@
 BrowserMainLoop::BrowserMainLoop(const content::MainFunctionParams& parameters)
     : parameters_(parameters),
       parsed_command_line_(parameters.command_line),
       result_code_(content::RESULT_CODE_NORMAL_EXIT) {
 #if defined(OS_WIN)
   OleInitialize(NULL);
 #endif
 }
 
 BrowserMainLoop::~BrowserMainLoop() {
-  // Release/destroy parts here, before OleUninitialize() and before other
-  // members are destroyed (in particular main_message_loop_).
-  parts_.reset();
+  // Destroy added parts in reverse order.
+  for (int i = static_cast<int>(parts_list_.size())-1; i >= 0; --i)
+    delete parts_list_[i];
+  parts_list_.clear();
 
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
 }
 
 void BrowserMainLoop::Init() {
-  parts_.reset(
-      GetContentClient()->browser()->CreateBrowserMainParts(parameters_));
+  GetContentClient()->browser()->CreateBrowserMainParts(
+      parameters_, &parts_list_);
 }
 
 // BrowserMainLoop stages ==================================================
 
 void BrowserMainLoop::EarlyInitialization() {
-  if (parts_.get())
-    parts_->PreEarlyInitialization();
+  for (size_t i = 0; i < parts_list_.size(); ++i)
+    parts_list_[i]->PreEarlyInitialization();
 
 #if defined(OS_WIN)
   net::EnsureWinsockInit();
 #endif
 
 #if !defined(USE_OPENSSL)
   // Use NSS for SSL by default.
   // The default client socket factory uses NSS for SSL by default on
   // Windows and Mac.
   bool init_nspr = false;
@@ skipping 25 matching lines @@
   if (parsed_command_line_.HasSwitch(
           switches::kEnableDNSCertProvenanceChecking)) {
     net::SSLConfigService::EnableDNSCertProvenanceChecking();
   }
 
   // TODO(abarth): Should this move to InitializeNetworkOptions?  This doesn't
   // seem dependent on SSL initialization().
   if (parsed_command_line_.HasSwitch(switches::kEnableTcpFastOpen))
     net::set_tcp_fastopen_enabled(true);
 
-  if (parts_.get())
-    parts_->PostEarlyInitialization();
+  for (size_t i = 0; i < parts_list_.size(); ++i)
+    parts_list_[i]->PostEarlyInitialization();
 }
 
 void BrowserMainLoop::MainMessageLoopStart() {
-  if (parts_.get())
-    parts_->PreMainMessageLoopStart();
+  for (size_t i = 0; i < parts_list_.size(); ++i)
+    parts_list_[i]->PreMainMessageLoopStart();
 
 #if defined(OS_WIN)
   // If we're running tests (ui_task is non-null), then the ResourceBundle
   // has already been initialized.
   if (!parameters_.ui_task) {
     // Override the configured locale with the user's preferred UI language.
     l10n_util::OverrideLocaleWithUILanguageList();
   }
 #endif
 
@@ skipping 10 matching lines @@
 
   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
 
-  if (parts_.get())
-    parts_->PostMainMessageLoopStart();
+  for (size_t i = 0; i < parts_list_.size(); ++i)
+    parts_list_[i]->PostMainMessageLoopStart();
 }
 
 void BrowserMainLoop::RunMainMessageLoopParts(
     bool* completed_main_message_loop) {
-  if (parts_.get())
-    parts_->PreMainMessageLoopRun();
+  for (size_t i = 0; i < parts_list_.size(); ++i)
+    parts_list_[i]->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);
 
+  // Iterate through each of the parts. If any of them ran the main
+  // message loop then they should return |true|. Otherwise
+  // BrowserMainLoop::MainMessageLoopRun loop will be run.
   bool ran_main_loop = false;
-  if (parts_.get())
-    ran_main_loop = parts_->MainMessageLoopRun(&result_code_);
-
+  for (size_t i = 0; i < parts_list_.size(); ++i) {
+    int result_code = result_code_;
+    if (parts_list_[i]->MainMessageLoopRun(&result_code)) {
+      ran_main_loop = true;
+      result_code_ = 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;
 
-  if (parts_.get())
-    parts_->PostMainMessageLoopRun();
+  for (size_t i = 0; i < parts_list_.size(); ++i)
+    parts_list_[i]->PostMainMessageLoopRun();
 }
 
 void BrowserMainLoop::InitializeMainThread() {
   const char* kThreadName = "CrBrowserMain";
   base::PlatformThread::SetName(kThreadName);
   main_message_loop_->set_thread_name(kThreadName);
 
   // Register the main thread by instantiating it, but don't call any methods.
   main_thread_.reset(new BrowserThreadImpl(BrowserThread::UI,
                                            MessageLoop::current()));
@@ skipping 28 matching lines @@
 
 #if defined(OS_WIN)
   // Init common control sex.
   INITCOMMONCONTROLSEX config;
   config.dwSize = sizeof(config);
   config.dwICC = ICC_WIN95_CLASSES;
   if (!InitCommonControlsEx(&config))
     LOG_GETLASTERROR(FATAL);
 #endif
 
-  if (parts_.get())
-    parts_->ToolkitInitialized();
+  for (size_t i = 0; i < parts_list_.size(); ++i)
+    parts_list_[i]->ToolkitInitialized();
 }
 
 void BrowserMainLoop::MainMessageLoopRun() {
   if (parameters_.ui_task)
     MessageLoopForUI::current()->PostTask(FROM_HERE, parameters_.ui_task);
 
 #if defined(OS_MACOSX)
   MessageLoopForUI::current()->Run();
 #else
   MessageLoopForUI::current()->RunWithDispatcher(NULL);
 #endif
 }
 
 }  // namespace content