Merge 141554 - Avoid crash in trying to access profile while shutting down.

chrome/browser/ui/browser.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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 4217 matching lines @@
 #endif
 
     case chrome::NOTIFICATION_PREF_CHANGED: {
       const std::string& pref_name =
           *content::Details<std::string>(details).ptr();
       if (pref_name == prefs::kPrintingEnabled) {
         UpdatePrintingState(GetContentRestrictionsForSelectedTab());
       } else if (pref_name == prefs::kInstantEnabled ||
                  pref_name == prefs::kMetricsReportingEnabled ||
                  pref_name == prefs::kSearchSuggestEnabled) {
-        if (!InstantController::IsEnabled(profile())) {
+        if (browser_shutdown::ShuttingDownWithoutClosingBrowsers() ||
+            !InstantController::IsEnabled(profile())) {
           if (instant()) {
             instant()->DestroyPreviewContents();
             instant_.reset();
             instant_unload_handler_.reset();
           }
         } else {
           CreateInstantIfNecessary();
         }
       } else if (pref_name == prefs::kIncognitoModeAvailability) {
         UpdateCommandsForIncognitoAvailability();
@@ skipping 1246 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }