Merge 46390 - Prevent chrome extension URL overrides from applying in incogni...

chrome/browser/extensions/extension_dom_ui.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/extensions/extension_dom_ui.h"
 
 #include <set>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 149 matching lines @@
 // static
 void ExtensionDOMUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(kExtensionURLOverrides);
 }
 
 // static
 bool ExtensionDOMUI::HandleChromeURLOverride(GURL* url, Profile* profile) {
   if (!url->SchemeIs(chrome::kChromeUIScheme))
     return false;
 
-  // Even when the extensions service is enabled by default, it's still
-  // disabled in incognito mode.
-  ExtensionsService* service = profile->GetExtensionsService();
-  if (!service)
+  // We can't handle chrome-extension URLs in incognito mode.
+  if (profile->IsOffTheRecord())
     return false;
 
   const DictionaryValue* overrides =
       profile->GetPrefs()->GetDictionary(kExtensionURLOverrides);
   std::string page = url->host();
   ListValue* url_list;
   if (!overrides || !overrides->GetList(UTF8ToWide(page), &url_list))
     return false;
 
+  ExtensionsService* service = profile->GetExtensionsService();
   if (!service->is_ready()) {
     // TODO(erikkay) So far, it looks like extensions load before the new tab
     // page.  I don't know if we have anything that enforces this, so add this
     // check for safety.
     NOTREACHED() << "Chrome URL override requested before extensions loaded";
     return false;
   }
 
   while (url_list->GetSize()) {
     Value* val;
@@ skipping 153 matching lines @@
 
   Extension* extension = service->GetExtensionByURL(page_url);
   if (!extension)
     return NULL;
 
   // TODO(arv): Move this off of the UI thread and onto the File thread. If
   //            possible to do this asynchronously, use ImageLoadingTracker.
   return ReadFileData(extension->GetIconPath(
       Extension::EXTENSION_ICON_BITTY).GetFilePathOnAnyThreadHack());
 }