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

chrome/browser/printing/print_job_manager.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/printing/print_job_manager.h"
 
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 17 matching lines @@
   queued_queries_.clear();
 }
 
 void PrintJobManager::InitOnUIThread(PrefService* prefs) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   printing_enabled_.Init(prefs::kPrintingEnabled, prefs, NULL);
   printing_enabled_.MoveToThread(BrowserThread::IO);
 }
 
 void PrintJobManager::OnQuit() {
-#if defined(OS_MACOSX)
-  // OnQuit is too late to try to wait for jobs on the Mac, since the runloop
-  // has already been torn down; instead, StopJobs(true) is called earlier in
-  // the shutdown process, and this is just here in case something sneaks
-  // in after that.
-  StopJobs(false);
-#else
   StopJobs(true);
-#endif
   registrar_.RemoveAll();
 }
 
 void PrintJobManager::StopJobs(bool wait_for_finish) {
   if (current_jobs_.empty())
     return;
   {
     // Copy the array since it can be modified in transit.
     PrintJobs current_jobs(current_jobs_);
     // Wait for each job to finish.
@@ skipping 107 matching lines @@
       break;
     }
   }
 }
 
 bool PrintJobManager::printing_enabled() const {
   return *printing_enabled_;
 }
 
 }  // namespace printing