Revert 101861 - Get rid of content::DidEndMainMessageLoop since it was declared in content but de...

chrome/browser/browser_process_impl.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 "chrome/browser/browser_process_impl.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 72 matching lines @@
 #include "content/common/notification_service.h"
 #include "ipc/ipc_logging.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 
 #if defined(OS_WIN)
 #include "views/focus/view_storage.h"
-#elif defined(OS_MACOSX)
-#include "chrome/browser/chrome_browser_main_mac.h"
 #endif
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 #include "content/common/child_process_messages.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
 #endif  // defined(OS_CHROMEOS)
@@ skipping 209 matching lines @@
   DCHECK_NE(0u, module_ref_count_);
   module_ref_count_--;
   if (0 == module_ref_count_) {
     // Allow UI and IO threads to do blocking IO on shutdown, since we do a lot
     // of it on shutdown for valid reasons.
     base::ThreadRestrictions::SetIOAllowed(true);
     CHECK(!BrowserList::GetLastActive());
     io_thread()->message_loop()->PostTask(
         FROM_HERE,
         NewRunnableFunction(&base::ThreadRestrictions::SetIOAllowed, true));
-
-#if defined(OS_MACOSX)
     MessageLoop::current()->PostTask(
-        FROM_HERE,
-        NewRunnableFunction(ChromeBrowserMainPartsMac::DidEndMainMessageLoop));
-#endif
+        FROM_HERE, NewRunnableFunction(content::DidEndMainMessageLoop));
     MessageLoop::current()->Quit();
   }
   return module_ref_count_;
 }
 
 void BrowserProcessImpl::EndSession() {
   // Mark all the profiles as clean.
   ProfileManager* pm = profile_manager();
   std::vector<Profile*> profiles(pm->GetLoadedProfiles());
   for (size_t i = 0; i < profiles.size(); ++i)
@@ skipping 785 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)