InstantExtended: hook up InstantTab in incognito.

chrome/browser/search_engines/template_url_service_factory.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/search_engines/template_url_service_factory.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
@@ skipping 84 matching lines @@
   registry->RegisterListPref(prefs::kDefaultSearchProviderAlternateURLs,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(
       prefs::kDefaultSearchProviderSearchTermsReplacementKey,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 content::BrowserContext* TemplateURLServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  // TODO(dougw): We need a separate instance of TemplateURLService in
-  // incognito profiles so that search-term-replacement can be disabled in
-  // incognito (see crbug.com/232065). Switch back to a shared instance once
-  // this is no longer necessary.
-  return chrome::GetBrowserContextOwnInstanceInIncognito(context);
+  return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool TemplateURLServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }
 
 void TemplateURLServiceFactory::BrowserContextShutdown(
     content::BrowserContext* profile) {
   // We shutdown AND destroy the TemplateURLService during this pass.
   // TemplateURLService schedules a task on the WebDataService from its
   // destructor. Delete it first to ensure the task gets scheduled before we
   // shut down the database.
   BrowserContextKeyedServiceFactory::BrowserContextShutdown(profile);
   BrowserContextKeyedServiceFactory::BrowserContextDestroyed(profile);
 }
 
 void TemplateURLServiceFactory::BrowserContextDestroyed(
     content::BrowserContext* profile) {
   // Don't double delete.
 }