At browser exit, wait for pending print jobs before starting shutdown. This is to avoid a nested me…

chrome/browser/browser_process_impl.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 "chrome/browser/browser_process_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 138 matching lines @@
 
   ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
       chrome::kExtensionScheme);
 
   extension_event_router_forwarder_ = new ExtensionEventRouterForwarder;
 
   ExtensionTabIdMap::GetInstance()->Init();
 }
 
 BrowserProcessImpl::~BrowserProcessImpl() {
-#if !defined(OS_ANDROID)
-  // Wait for the pending print jobs to finish.
-  print_job_manager_->OnQuit();
-  print_job_manager_.reset();
-#endif
-
   tracked_objects::ThreadData::EnsureCleanupWasCalled(4);
 
   g_browser_process = NULL;
 }
 
 void BrowserProcessImpl::StartTearDown() {
 #if defined(ENABLE_AUTOMATION)
   // Delete the AutomationProviderList before NotificationService,
   // since it may try to unregister notifications
   // Both NotificationService and AutomationProvider are singleton instances in
@@ skipping 99 matching lines @@
   return module_ref_count_;
 }
 
 unsigned int BrowserProcessImpl::ReleaseModule() {
   DCHECK(CalledOnValidThread());
   DCHECK_NE(0u, module_ref_count_);
   module_ref_count_--;
   if (0 == module_ref_count_) {
     release_last_reference_callstack_ = base::debug::StackTrace();
 
+#if !defined(OS_ANDROID)
+    // Wait for the pending print jobs to finish. Don't do this later, since
+    // this might cause a nested message loop to run, and we don't want pending
+    // tasks to run once teardown has started.
+    print_job_manager_->OnQuit();
+    print_job_manager_.reset();
+#endif
+
     CHECK(MessageLoop::current()->is_running());
     // 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());
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(base::IgnoreResult(&base::ThreadRestrictions::SetIOAllowed),
                    true));
@@ skipping 631 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)