Merge 54713 - Shutdown the notification UI manager before the notifications s...

chrome/browser/browser_process_impl.cc

 // Copyright (c) 2010 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 "app/clipboard/clipboard.h"
 #include "app/l10n_util.h"
@@ skipping 174 matching lines @@
   resource_dispatcher_host_.reset();
 
   // Wait for the pending print jobs to finish.
   print_job_manager_->OnQuit();
   print_job_manager_.reset();
 
   // Destroy TabCloseableStateWatcher before NotificationService since the
   // former registers for notifications.
   tab_closeable_state_watcher_.reset();
 
+  // Destroy NotificationUIManager before NotificationService is shut down.
+  notification_ui_manager_.reset();
+
   // Now OK to destroy NotificationService.
   main_notification_service_.reset();
 
   // Prior to clearing local state, we want to complete tasks pending
   // on the db thread too.
   db_thread_.reset();
 
   // At this point, no render process exist and the file, io, db, and
   // webkit threads in this process have all terminated, so it's safe
   // to access local state data such as cookies, database, or local storage.
@@ skipping 392 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)