Remove Profile* from TemplateURL

Remove TemplateURL::profile_.
Remove TemplateURLService::AddAndSetProfile which does nothing other than calling Add().
Merge TemplateURLService::GenerateSearchURLUsingTermsData and GenerateSearchURLUsingTermsData.

BUG=383283
TEST=git cl try
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/338363004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277965 0039d316-1c4b-4281-b951-d872f2087c98

51 files changed, 235 insertions, 308 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
index a2cd035..1b381fc 100644
--- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
@@ -218,7 +218,7 @@ void AutocompleteProviderTest::RegisterTemplateURL(
   TemplateURLData data;
   data.SetURL(template_url);
   data.SetKeyword(keyword);
-  TemplateURL* default_t_url = new TemplateURL(&profile_, data);
+  TemplateURL* default_t_url = new TemplateURL(data);
   TemplateURLService* turl_model =
       TemplateURLServiceFactory::GetForProfile(&profile_);
   turl_model->Add(default_t_url);
@@ -294,7 +294,7 @@ void AutocompleteProviderTest::
   // Reset the default TemplateURL.
   TemplateURLData data;
   data.SetURL("http://defaultturl/{searchTerms}");
-  TemplateURL* default_t_url = new TemplateURL(&profile_, data);
+  TemplateURL* default_t_url = new TemplateURL(data);
   TemplateURLService* turl_model =
       TemplateURLServiceFactory::GetForProfile(&profile_);
   turl_model->Add(default_t_url);
@@ -307,7 +307,7 @@ void AutocompleteProviderTest::
   data2.short_name = base::ASCIIToUTF16("k");
   data2.SetKeyword(base::ASCIIToUTF16("k"));
   data2.SetURL("http://keyword/{searchTerms}");
-  TemplateURL* keyword_t_url = new TemplateURL(&profile_, data2);
+  TemplateURL* keyword_t_url = new TemplateURL(data2);
   turl_model->Add(keyword_t_url);
   ASSERT_NE(0, keyword_t_url->id());
 
@@ -328,7 +328,7 @@ void AutocompleteProviderTest::ResetControllerWithKeywordProvider() {
   data.short_name = base::ASCIIToUTF16("foo.com");
   data.SetKeyword(base::ASCIIToUTF16("foo.com"));
   data.SetURL("http://foo.com/{searchTerms}");
-  TemplateURL* keyword_t_url = new TemplateURL(&profile_, data);
+  TemplateURL* keyword_t_url = new TemplateURL(data);
   turl_model->Add(keyword_t_url);
   ASSERT_NE(0, keyword_t_url->id());
 
@@ -336,7 +336,7 @@ void AutocompleteProviderTest::ResetControllerWithKeywordProvider() {
   data.short_name = base::ASCIIToUTF16("bar.com");
   data.SetKeyword(base::ASCIIToUTF16("bar.com"));
   data.SetURL("http://bar.com/{searchTerms}");
-  keyword_t_url = new TemplateURL(&profile_, data);
+  keyword_t_url = new TemplateURL(data);
   turl_model->Add(keyword_t_url);
   ASSERT_NE(0, keyword_t_url->id());
 
diff --git a/chrome/browser/autocomplete/autocomplete_result_unittest.cc b/chrome/browser/autocomplete/autocomplete_result_unittest.cc
index 28ab9a5..238509b 100644
--- a/chrome/browser/autocomplete/autocomplete_result_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_result_unittest.cc
@@ -319,7 +319,7 @@ TEST_F(AutocompleteResultTest, SortAndCullDuplicateSearchURLs) {
   url_data.short_name = base::ASCIIToUTF16("unittest");
   url_data.SetKeyword(base::ASCIIToUTF16("foo"));
   url_data.SetURL("http://www.foo.com/s?q={searchTerms}");
-  test_util_.model()->Add(new TemplateURL(test_util_.profile(), url_data));
+  test_util_.model()->Add(new TemplateURL(url_data));
 
   TestData data[] = {
     { 0, 0, 1300 },
@@ -364,7 +364,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithMatchDups) {
   url_data.short_name = base::ASCIIToUTF16("unittest");
   url_data.SetKeyword(base::ASCIIToUTF16("foo"));
   url_data.SetURL("http://www.foo.com/s?q={searchTerms}");
-  test_util_.model()->Add(new TemplateURL(test_util_.profile(), url_data));
+  test_util_.model()->Add(new TemplateURL(url_data));
 
   AutocompleteMatch dup_match;
   dup_match.destination_url = GURL("http://www.foo.com/s?q=foo&oq=dup");
diff --git a/chrome/browser/autocomplete/base_search_provider.cc b/chrome/browser/autocomplete/base_search_provider.cc
index 5e55e9c..70833e9 100644
--- a/chrome/browser/autocomplete/base_search_provider.cc
+++ b/chrome/browser/autocomplete/base_search_provider.cc
@@ -467,7 +467,8 @@ void BaseSearchProvider::SetDeletionURL(const std::string& deletion_url,
   if (!template_service)
     return;
   GURL url = TemplateURLService::GenerateSearchURL(
-      template_service->GetDefaultSearchProvider());
+      template_service->GetDefaultSearchProvider(),
+      template_service->search_terms_data());
   url = url.GetOrigin().Resolve(deletion_url);
   if (url.is_valid()) {
     match->RecordAdditionalInfo(BaseSearchProvider::kDeletionUrlKey,
diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc
index 31240fb..6d1e9bf7 100644
--- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc
@@ -649,7 +649,7 @@ TEST_F(HistoryQuickProviderTest, CullSearchResults) {
   data.SetURL("http://testsearch.com/?q={searchTerms}");
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile_.get());
-  TemplateURL* template_url = new TemplateURL(profile_.get(), data);
+  TemplateURL* template_url = new TemplateURL(data);
   template_url_service->Add(template_url);
   template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
   template_url_service->Load();
diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc
index f46eb96..d60910b 100644
--- a/chrome/browser/autocomplete/history_url_provider.cc
+++ b/chrome/browser/autocomplete/history_url_provider.cc
@@ -420,8 +420,7 @@ HistoryURLProviderParams::HistoryURLProviderParams(
       languages(languages),
       dont_suggest_exact_input(false),
       default_search_provider(default_search_provider ?
-          new TemplateURL(default_search_provider->profile(),
-                          default_search_provider->data()) : NULL),
+          new TemplateURL(default_search_provider->data()) : NULL),
       search_terms_data(new SearchTermsDataSnapshot(search_terms_data)) {
 }
 
diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc
index 8680f419..ed3393a 100644
--- a/chrome/browser/autocomplete/history_url_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc
@@ -792,7 +792,7 @@ TEST_F(HistoryURLProviderTest, CullSearchResults) {
   data.SetURL("http://testsearch.com/?q={searchTerms}");
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile_.get());
-  TemplateURL* template_url = new TemplateURL(profile_.get(), data);
+  TemplateURL* template_url = new TemplateURL(data);
   template_url_service->Add(template_url);
   template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
   template_url_service->Load();
diff --git a/chrome/browser/autocomplete/keyword_provider_unittest.cc b/chrome/browser/autocomplete/keyword_provider_unittest.cc
index d172d46..adf5ecf 100644
--- a/chrome/browser/autocomplete/keyword_provider_unittest.cc
+++ b/chrome/browser/autocomplete/keyword_provider_unittest.cc
@@ -259,7 +259,7 @@ TEST_F(KeywordProviderTest, AddKeyword) {
   base::string16 keyword(ASCIIToUTF16("foo"));
   data.SetKeyword(keyword);
   data.SetURL("http://www.google.com/foo?q={searchTerms}");
-  TemplateURL* template_url = new TemplateURL(NULL, data);
+  TemplateURL* template_url = new TemplateURL(data);
   model_->Add(template_url);
   ASSERT_TRUE(template_url == model_->GetTemplateURLForKeyword(keyword));
 }
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index a27ba46..04928a3 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -253,7 +253,7 @@ void SearchProviderTest::SetUp() {
   data.suggestions_url = "http://defaultturl2/{searchTerms}";
   data.instant_url = "http://does/not/exist?strk=1";
   data.search_terms_replacement_key = "strk";
-  default_t_url_ = new TemplateURL(&profile_, data);
+  default_t_url_ = new TemplateURL(data);
   turl_model->Add(default_t_url_);
   turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
   TemplateURLID default_provider_id = default_t_url_->id();
@@ -267,7 +267,7 @@ void SearchProviderTest::SetUp() {
   data.SetKeyword(ASCIIToUTF16("k"));
   data.SetURL("http://keyword/{searchTerms}");
   data.suggestions_url = "http://suggest_keyword/{searchTerms}";
-  keyword_t_url_ = new TemplateURL(&profile_, data);
+  keyword_t_url_ = new TemplateURL(data);
   turl_model->Add(keyword_t_url_);
   ASSERT_NE(0, keyword_t_url_->id());
 
@@ -1033,7 +1033,7 @@ TEST_F(SearchProviderTest, CommandLineOverrides) {
   data.short_name = ASCIIToUTF16("default");
   data.SetKeyword(data.short_name);
   data.SetURL("{google:baseURL}{searchTerms}");
-  default_t_url_ = new TemplateURL(&profile_, data);
+  default_t_url_ = new TemplateURL(data);
   turl_model->Add(default_t_url_);
   turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
 
@@ -2896,7 +2896,7 @@ TEST_F(SearchProviderTest, CanSendURL) {
   template_url_data.instant_url = "http://does/not/exist?strk=1";
   template_url_data.search_terms_replacement_key = "strk";
   template_url_data.id = SEARCH_ENGINE_GOOGLE;
-  TemplateURL google_template_url(&profile_, template_url_data);
+  TemplateURL google_template_url(template_url_data);
 
   // Create field trial.
   base::FieldTrial* field_trial = base::FieldTrialList::CreateFieldTrial(
@@ -3131,7 +3131,7 @@ TEST_F(SearchProviderTest, SuggestQueryUsesToken) {
   data.SetURL("http://example/{searchTerms}{google:sessionToken}");
   data.suggestions_url =
       "http://suggest/?q={searchTerms}&{google:sessionToken}";
-  default_t_url_ = new TemplateURL(&profile_, data);
+  default_t_url_ = new TemplateURL(data);
   turl_model->Add(default_t_url_);
   turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
 
diff --git a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc
index 8178bdb..a35e75b 100644
--- a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc
+++ b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc
@@ -103,7 +103,7 @@ void ShortcutsBackendTest::SetSearchProvider() {
   data.SetURL("http://foo.com/search?bar={searchTerms}");
   data.SetKeyword(base::UTF8ToUTF16("foo"));
 
-  TemplateURL* template_url = new TemplateURL(&profile_, data);
+  TemplateURL* template_url = new TemplateURL(data);
   // Takes ownership of |template_url|.
   template_url_service->Add(template_url);
   template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
diff --git a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc
index f2bfdc7..14df843 100644
--- a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc
+++ b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc
@@ -77,7 +77,7 @@ void ZeroSuggestProviderTest::SetUp() {
   data.suggestions_url = "https://www.google.com/complete/?q={searchTerms}";
   data.instant_url = "https://does/not/exist?strk=1";
   data.search_terms_replacement_key = "strk";
-  default_t_url_ = new TemplateURL(&profile_, data);
+  default_t_url_ = new TemplateURL(data);
   turl_model->Add(default_t_url_);
   turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
 
diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc
index 399d034..8a0268f 100644
--- a/chrome/browser/chrome_content_browser_client_unittest.cc
+++ b/chrome/browser/chrome_content_browser_client_unittest.cc
@@ -109,7 +109,7 @@ class InstantNTPURLRewriteTest : public BrowserWithTestWindowTest {
     TemplateURLData data;
     data.SetURL("http://foo.com/url?bar={searchTerms}");
     data.new_tab_url = new_tab_page_url.spec();
-    TemplateURL* template_url = new TemplateURL(browser()->profile(), data);
+    TemplateURL* template_url = new TemplateURL(data);
     // Takes ownership.
     template_url_service->Add(template_url);
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
index 379da9f..c8d56c2 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
@@ -270,8 +270,7 @@ void SettingsOverridesAPI::RegisterSearchProvider(
   TemplateURLData data = ConvertSearchProvider(
       profile_->GetPrefs(), *settings->search_engine, install_parameter);
   data.show_in_default_list = info->wants_to_be_default_engine;
-  url_service_->AddExtensionControlledTURL(new TemplateURL(profile_, data),
-                                           info.Pass());
+  url_service_->AddExtensionControlledTURL(new TemplateURL(data), info.Pass());
 }
 
 template <>
diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc
index 1ae40985..8ab3c09 100644
--- a/chrome/browser/importer/in_process_importer_bridge.cc
+++ b/chrome/browser/importer/in_process_importer_bridge.cc
@@ -107,7 +107,7 @@ TemplateURL* CreateTemplateURL(const base::string16& title,
   data.short_name = title.empty() ? keyword : title;
   data.SetURL(
       TemplateURLRef::DisplayURLToURLRef(base::UTF8ToUTF16(url.spec())));
-  return new TemplateURL(NULL, data);
+  return new TemplateURL(data);
 }
 
 // Parses the OpenSearch XML files in |xml_files| and populates |search_engines|
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index 3350dfc..5fa1777 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -318,7 +318,7 @@ void ProfileWriter::AddKeywords(ScopedVector<TemplateURL> template_urls,
 
     // Only add valid TemplateURLs to the model.
     if ((*i)->url_ref().IsValid(model->search_terms_data())) {
-      model->AddAndSetProfile(*i, profile_);  // Takes ownership.
+      model->Add(*i);  // Takes ownership.
       *i = NULL;  // Prevent the vector from deleting *i later.
     }
   }
diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc
index ca878f9..502b805 100644
--- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc
+++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc
@@ -258,7 +258,7 @@ scoped_ptr<base::ListValue> AutomaticProfileResetterDelegateImpl::
   scoped_ptr<base::ListValue> engines_details_list(new base::ListValue);
   for (ScopedVector<TemplateURLData>::const_iterator it = engines.begin();
        it != engines.end(); ++it) {
-    TemplateURL template_url(profile_, **it);
+    TemplateURL template_url(**it);
     engines_details_list->Append(
         BuildSubTreeFromTemplateURL(&template_url).release());
   }
diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc
index 3335ff3..23d7837 100644
--- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc
+++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc
@@ -206,7 +206,7 @@ class AutomaticProfileResetterDelegateTest
     data.input_encodings.push_back("UTF-8");
     data.safe_for_autoreplace = true;
 
-    return scoped_ptr<TemplateURL>(new TemplateURL(profile(), data));
+    return scoped_ptr<TemplateURL>(new TemplateURL(data));
   }
 
   void ExpectNoPendingBrandcodedConfigFetch() {
diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc
index 44bee23..7c876ab 100644
--- a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc
+++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc
@@ -313,7 +313,8 @@ scoped_ptr<base::ListValue> GetReadableFeedbackForSnapshot(
   if (dse) {
     AddPair(list.get(),
             l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_DSE),
-            TemplateURLService::GenerateSearchURL(dse).host());
+            TemplateURLService::GenerateSearchURL(
+                dse, service->search_terms_data()).host());
   }
 
   if (snapshot.shortcuts_determined()) {
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 89ba8fe..d88c2ba 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -1847,7 +1847,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
             TemplateURL::GenerateFaviconURL(params_.page_url.GetOrigin());
         // Takes ownership of the TemplateURL.
         search_engine_tab_helper->delegate()->
-            ConfirmAddSearchProvider(new TemplateURL(profile_, data), profile_);
+            ConfirmAddSearchProvider(new TemplateURL(data), profile_);
       }
       break;
     }
diff --git a/chrome/browser/search/instant_service_unittest.cc b/chrome/browser/search/instant_service_unittest.cc
index eca0fe4..f681c60 100644
--- a/chrome/browser/search/instant_service_unittest.cc
+++ b/chrome/browser/search/instant_service_unittest.cc
@@ -131,7 +131,7 @@ TEST_F(InstantServiceEnabledTest,
   // Set a default search provider that doesn't support Instant.
   TemplateURLData data;
   data.SetURL("https://foobar.com/url?bar={searchTerms}");
-  TemplateURL* template_url = new TemplateURL(profile(), data);
+  TemplateURL* template_url = new TemplateURL(data);
   // Takes ownership of |template_url|.
   template_url_service_->Add(template_url);
   template_url_service_->SetUserSelectedDefaultSearchProvider(template_url);
diff --git a/chrome/browser/search/instant_unittest_base.cc b/chrome/browser/search/instant_unittest_base.cc
index 68d0277..996b301 100644
--- a/chrome/browser/search/instant_unittest_base.cc
+++ b/chrome/browser/search/instant_unittest_base.cc
@@ -60,7 +60,7 @@ void InstantUnitTestBase::SetUserSelectedDefaultSearchProvider(
   data.alternate_urls.push_back(base_url + "alt#quux={searchTerms}");
   data.search_terms_replacement_key = "strk";
 
-  TemplateURL* template_url = new TemplateURL(profile(), data);
+  TemplateURL* template_url = new TemplateURL(data);
   // Takes ownership of |template_url|.
   template_url_service_->Add(template_url);
   template_url_service_->SetUserSelectedDefaultSearchProvider(template_url);
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
index b50d75c..c90dbdc 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -183,7 +183,7 @@ class SearchTest : public BrowserWithTestWindowTest {
     data.alternate_urls.push_back("http://foo.com/alt#quux={searchTerms}");
     data.search_terms_replacement_key = "strk";
 
-    TemplateURL* template_url = new TemplateURL(profile(), data);
+    TemplateURL* template_url = new TemplateURL(data);
     // Takes ownership of |template_url|.
     template_url_service->Add(template_url);
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
@@ -207,7 +207,7 @@ class SearchTest : public BrowserWithTestWindowTest {
         kInstantURLWithStrk : kInstantURLNoStrk);
     data.search_terms_replacement_key = "strk";
 
-    TemplateURL* template_url = new TemplateURL(profile(), data);
+    TemplateURL* template_url = new TemplateURL(data);
     // Takes ownership of |template_url|.
     template_url_service->Add(template_url);
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
@@ -625,7 +625,7 @@ TEST_F(SearchTest, CommandLineOverrides) {
   data.SetURL("{google:baseURL}search?q={searchTerms}");
   data.instant_url = "{google:baseURL}webhp?strk";
   data.search_terms_replacement_key = "strk";
-  TemplateURL* template_url = new TemplateURL(profile(), data);
+  TemplateURL* template_url = new TemplateURL(data);
   // Takes ownership of |template_url|.
   template_url_service->Add(template_url);
   template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
@@ -899,7 +899,7 @@ class SearchURLTest : public SearchTest {
     data.SetURL("{google:baseURL}search?"
                 "{google:instantExtendedEnabledParameter}q={searchTerms}");
     data.search_terms_replacement_key = "espv";
-    template_url_ = new TemplateURL(profile(), data);
+    template_url_ = new TemplateURL(data);
     // |template_url_service| takes ownership of |template_url_|.
     template_url_service->Add(template_url_);
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url_);
diff --git a/chrome/browser/search_engines/default_search_policy_handler.cc b/chrome/browser/search_engines/default_search_policy_handler.cc
index 943eb0b..fedc401 100644
--- a/chrome/browser/search_engines/default_search_policy_handler.cc
+++ b/chrome/browser/search_engines/default_search_policy_handler.cc
@@ -438,7 +438,7 @@ bool DefaultSearchPolicyHandler::DefaultSearchURLIsValid(
   TemplateURLData data;
   data.SetURL(*url_string);
   SearchTermsData search_terms_data;
-  return TemplateURL(NULL, data).SupportsReplacement(search_terms_data);
+  return TemplateURL(data).SupportsReplacement(search_terms_data);
 }
 
 void DefaultSearchPolicyHandler::EnsureStringPrefExists(
diff --git a/chrome/browser/search_engines/default_search_pref_migration_unittest.cc b/chrome/browser/search_engines/default_search_pref_migration_unittest.cc
index bc245f9..da1a6ba 100644
--- a/chrome/browser/search_engines/default_search_pref_migration_unittest.cc
+++ b/chrome/browser/search_engines/default_search_pref_migration_unittest.cc
@@ -62,7 +62,7 @@ scoped_ptr<TemplateURL> DefaultSearchPrefMigrationTest::CreateKeyword(
   data.short_name = base::ASCIIToUTF16(short_name);
   data.SetKeyword(base::ASCIIToUTF16(keyword));
   data.SetURL(url);
-  scoped_ptr<TemplateURL> t_url(new TemplateURL(profile(), data));
+  scoped_ptr<TemplateURL> t_url(new TemplateURL(data));
   return t_url.Pass();
 }
 
@@ -150,7 +150,7 @@ TEST_F(DefaultSearchPrefMigrationTest,
       *default_search_manager()->GetDefaultSearchEngine(&source));
   EXPECT_EQ(DefaultSearchManager::FROM_FALLBACK, source);
 
-  TemplateURL prepopulated_turl(profile(), prepopulated_default);
+  TemplateURL prepopulated_turl(prepopulated_default);
 
   // Store a value in the legacy location.
   TemplateURLService::SaveDefaultSearchProviderToPrefs(&prepopulated_turl,
diff --git a/chrome/browser/search_engines/search_host_to_urls_map.cc b/chrome/browser/search_engines/search_host_to_urls_map.cc
index 092eac7..276573cb 100644
--- a/chrome/browser/search_engines/search_host_to_urls_map.cc
+++ b/chrome/browser/search_engines/search_host_to_urls_map.cc
@@ -28,7 +28,7 @@ void SearchHostToURLsMap::Add(TemplateURL* template_url,
   DCHECK(initialized_);
   DCHECK(template_url);
 
-  const GURL url(TemplateURLService::GenerateSearchURLUsingTermsData(
+  const GURL url(TemplateURLService::GenerateSearchURL(
       template_url, search_terms_data));
   if (!url.is_valid() || !url.has_host())
     return;
@@ -41,7 +41,7 @@ void SearchHostToURLsMap::Remove(TemplateURL* template_url,
   DCHECK(initialized_);
   DCHECK(template_url);
 
-  const GURL url(TemplateURLService::GenerateSearchURLUsingTermsData(
+  const GURL url(TemplateURLService::GenerateSearchURL(
       template_url, search_terms_data));
   if (!url.is_valid() || !url.has_host())
     return;
diff --git a/chrome/browser/search_engines/search_host_to_urls_map_unittest.cc b/chrome/browser/search_engines/search_host_to_urls_map_unittest.cc
index c175dba..db1cb9a 100644
--- a/chrome/browser/search_engines/search_host_to_urls_map_unittest.cc
+++ b/chrome/browser/search_engines/search_host_to_urls_map_unittest.cc
@@ -31,9 +31,9 @@ void SearchHostToURLsMapTest::SetUp() {
   host_ = "www.unittest.com";
   TemplateURLData data;
   data.SetURL("http://" + host_ + "/path1");
-  t_urls_[0].reset(new TemplateURL(NULL, data));
+  t_urls_[0].reset(new TemplateURL(data));
   data.SetURL("http://" + host_ + "/path2");
-  t_urls_[1].reset(new TemplateURL(NULL, data));
+  t_urls_[1].reset(new TemplateURL(data));
   std::vector<TemplateURL*> template_urls;
   template_urls.push_back(t_urls_[0].get());
   template_urls.push_back(t_urls_[1].get());
@@ -47,7 +47,7 @@ TEST_F(SearchHostToURLsMapTest, Add) {
   std::string new_host = "example.com";
   TemplateURLData data;
   data.SetURL("http://" + new_host + "/");
-  TemplateURL new_t_url(NULL, data);
+  TemplateURL new_t_url(data);
   UIThreadSearchTermsData search_terms_data(NULL);
   provider_map_->Add(&new_t_url, search_terms_data);
 
diff --git a/chrome/browser/search_engines/search_provider_install_data.cc b/chrome/browser/search_engines/search_provider_install_data.cc
index 68fa4ec..d1fdd3a 100644
--- a/chrome/browser/search_engines/search_provider_install_data.cc
+++ b/chrome/browser/search_engines/search_provider_install_data.cc
@@ -45,7 +45,7 @@ void LoadDataOnUIThread(TemplateURLService* template_url_service,
            original_template_urls.begin();
        it != original_template_urls.end();
        ++it) {
-    template_url_copies.push_back(new TemplateURL(NULL, (*it)->data()));
+    template_url_copies.push_back(new TemplateURL((*it)->data()));
     if (*it == original_default_provider)
       default_provider_copy = template_url_copies.back();
   }
@@ -179,7 +179,7 @@ static bool IsSameOrigin(const GURL& requested_origin,
   DCHECK(requested_origin == requested_origin.GetOrigin());
   DCHECK(template_url->GetType() != TemplateURL::OMNIBOX_API_EXTENSION);
   return requested_origin ==
-      TemplateURLService::GenerateSearchURLUsingTermsData(template_url,
+      TemplateURLService::GenerateSearchURL(template_url,
           search_terms_data).GetOrigin();
 }
 
@@ -284,7 +284,7 @@ void SearchProviderInstallData::SetDefault(const TemplateURL* template_url) {
   DCHECK(template_url->GetType() != TemplateURL::OMNIBOX_API_EXTENSION);
 
   IOThreadSearchTermsData search_terms_data(google_base_url_);
-  const GURL url(TemplateURLService::GenerateSearchURLUsingTermsData(
+  const GURL url(TemplateURLService::GenerateSearchURL(
       template_url, search_terms_data));
   if (!url.is_valid() || !url.has_host()) {
     default_search_origin_.clear();
diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc
index c21930c..2c4b7ca 100644
--- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc
+++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc
@@ -178,7 +178,7 @@ TemplateURL* SearchProviderInstallDataTest::AddNewTemplateURL(
   data.short_name = keyword;
   data.SetKeyword(keyword);
   data.SetURL(url);
-  TemplateURL* t_url = new TemplateURL(util_.profile(), data);
+  TemplateURL* t_url = new TemplateURL(data);
   util_.model()->Add(t_url);
   return t_url;
 }
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 6cc39b7..9034513 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -1128,9 +1128,8 @@ std::string TemplateURLRef::HandleReplacements(
 
 // TemplateURL ----------------------------------------------------------------
 
-TemplateURL::TemplateURL(Profile* profile, const TemplateURLData& data)
-    : profile_(profile),
-      data_(data),
+TemplateURL::TemplateURL(const TemplateURLData& data)
+    : data_(data),
       url_ref_(this, TemplateURLRef::SEARCH),
       suggestions_url_ref_(this,
                            TemplateURLRef::SUGGEST),
@@ -1233,7 +1232,7 @@ bool TemplateURL::HasSameKeywordAs(
     const SearchTermsData& search_terms_data) const {
   return (data_.keyword() == other.keyword()) ||
       (IsGoogleSearchURLWithReplaceableKeyword(search_terms_data) &&
-       TemplateURL(NULL, other).IsGoogleSearchURLWithReplaceableKeyword(
+       TemplateURL(other).IsGoogleSearchURLWithReplaceableKeyword(
            search_terms_data));
 }
 
@@ -1359,7 +1358,6 @@ void TemplateURL::CopyFrom(const TemplateURL& other) {
   if (this == &other)
     return;
 
-  profile_ = other.profile_;
   data_ = other.data_;
   url_ref_.InvalidateCachedValues();
   suggestions_url_ref_.InvalidateCachedValues();
@@ -1385,7 +1383,7 @@ void TemplateURL::ResetKeywordIfNecessary(
     bool force) {
   if (IsGoogleSearchURLWithReplaceableKeyword(search_terms_data) || force) {
     DCHECK(GetType() != OMNIBOX_API_EXTENSION);
-    GURL url(TemplateURLService::GenerateSearchURL(this));
+    GURL url(TemplateURLService::GenerateSearchURL(this, search_terms_data));
     if (url.is_valid())
       data_.SetKeyword(TemplateURLService::GenerateKeyword(url));
   }
diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h
index 1f09445..ec07d52 100644
--- a/chrome/browser/search_engines/template_url.h
+++ b/chrome/browser/search_engines/template_url.h
@@ -19,7 +19,6 @@
 #include "url/gurl.h"
 #include "url/url_parse.h"
 
-class Profile;
 class SearchTermsData;
 class TemplateURL;
 
@@ -464,8 +463,7 @@ struct AssociatedExtensionInfo {
 // different capabilities (e.g. doing searches or getting suggestions), as well
 // as a TemplateURLData containing other details like the name, keyword, etc.
 //
-// TemplateURLs are intended to be read-only for most users; the only public
-// non-const method is the Profile getter, which returns a non-const Profile*.
+// TemplateURLs are intended to be read-only for most users.
 // The TemplateURLService, which handles storing and manipulating TemplateURLs,
 // is made a friend so that it can be the exception to this pattern.
 class TemplateURL {
@@ -478,9 +476,7 @@ class TemplateURL {
     // The keyword associated with an extension that uses the Omnibox API.
     OMNIBOX_API_EXTENSION,
   };
-  // |profile| may be NULL.  This will affect the results of e.g. calling
-  // ReplaceSearchTerms() on the member TemplateURLRefs.
-  TemplateURL(Profile* profile, const TemplateURLData& data);
+  explicit TemplateURL(const TemplateURLData& data);
   ~TemplateURL();
 
   // Generates a favicon URL from the specified url.
@@ -492,7 +488,6 @@ class TemplateURL {
                           const TemplateURLData* data,
                           const SearchTermsData& search_terms_data);
 
-  Profile* profile() { return profile_; }
   const TemplateURLData& data() const { return data_; }
 
   const base::string16& short_name() const { return data_.short_name; }
@@ -681,7 +676,6 @@ class TemplateURL {
                             url::Parsed::ComponentType* search_terms_component,
                             url::Component* search_terms_position);
 
-  Profile* profile_;
   TemplateURLData data_;
   TemplateURLRef url_ref_;
   TemplateURLRef suggestions_url_ref_;
diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc
index 03ec455..fe04245 100644
--- a/chrome/browser/search_engines/template_url_fetcher.cc
+++ b/chrome/browser/search_engines/template_url_fetcher.cc
@@ -196,7 +196,7 @@ void TemplateURLFetcher::RequestDelegate::AddSearchProvider() {
     case AUTODETECTED_PROVIDER:
       // Mark the keyword as replaceable so it can be removed if necessary.
       data.safe_for_autoreplace = true;
-      model->Add(new TemplateURL(profile, data));
+      model->Add(new TemplateURL(data));
       break;
 
     case EXPLICIT_PROVIDER:
@@ -206,8 +206,7 @@ void TemplateURLFetcher::RequestDelegate::AddSearchProvider() {
       // The source WebContents' delegate takes care of adding the URL to the
       // model, which takes ownership, or of deleting it if the add is
       // cancelled.
-      callbacks_->ConfirmAddSearchProvider(new TemplateURL(profile, data),
-                                           profile);
+      callbacks_->ConfirmAddSearchProvider(new TemplateURL(data), profile);
       break;
 
     default:
diff --git a/chrome/browser/search_engines/template_url_fetcher_unittest.cc b/chrome/browser/search_engines/template_url_fetcher_unittest.cc
index 10e7cd9..8ec7e48 100644
--- a/chrome/browser/search_engines/template_url_fetcher_unittest.cc
+++ b/chrome/browser/search_engines/template_url_fetcher_unittest.cc
@@ -296,7 +296,7 @@ TEST_F(TemplateURLFetcherTest, DuplicateKeywordsTest) {
   data.short_name = keyword;
   data.SetKeyword(keyword);
   data.SetURL("http://example.com/");
-  test_util_.model()->Add(new TemplateURL(test_util_.profile(), data));
+  test_util_.model()->Add(new TemplateURL(data));
   test_util_.ChangeModelToLoadState();
 
   ASSERT_TRUE(test_util_.model()->GetTemplateURLForKeyword(keyword));
diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc
index a0ae037..aad9c66 100644
--- a/chrome/browser/search_engines/template_url_parser.cc
+++ b/chrome/browser/search_engines/template_url_parser.cc
@@ -303,7 +303,7 @@ TemplateURL* TemplateURLParsingContext::GetTemplateURL(
   data_.show_in_default_list = show_in_default_list;
 
   // Bail if the search URL is empty or if either TemplateURLRef is invalid.
-  scoped_ptr<TemplateURL> template_url(new TemplateURL(profile, data_));
+  scoped_ptr<TemplateURL> template_url(new TemplateURL(data_));
   scoped_ptr<SearchTermsData> search_terms_data(profile ?
       new UIThreadSearchTermsData(profile) : new SearchTermsData());
   if (template_url->url().empty() ||
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
index 32df621..0047fd9 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
@@ -27,12 +27,12 @@ namespace {
 SearchEngineType GetEngineType(const std::string& url) {
   TemplateURLData data;
   data.SetURL(url);
-  return TemplateURLPrepopulateData::GetEngineType(TemplateURL(NULL, data),
+  return TemplateURLPrepopulateData::GetEngineType(TemplateURL(data),
                                                    SearchTermsData());
 }
 
 std::string GetHostFromTemplateURLData(const TemplateURLData& data) {
-  return TemplateURL(NULL, data).url_ref().GetHost(SearchTermsData());
+  return TemplateURL(data).url_ref().GetHost(SearchTermsData());
 }
 
 }  // namespace
@@ -244,7 +244,7 @@ TEST(TemplateURLPrepopulateDataTest, ClearProvidersFromPrefs) {
   EXPECT_FALSE(t_urls[default_index]->image_url_post_params.empty());
   EXPECT_EQ(SEARCH_ENGINE_GOOGLE,
             TemplateURLPrepopulateData::GetEngineType(
-                TemplateURL(NULL, *t_urls[default_index]),
+                TemplateURL(*t_urls[default_index]),
                 SearchTermsData()));
 }
 
@@ -284,7 +284,7 @@ TEST(TemplateURLPrepopulateDataTest, ProvidersFromPrepopulated) {
     EXPECT_FALSE(t_urls[default_index]->alternate_urls[i].empty());
   EXPECT_EQ(SEARCH_ENGINE_GOOGLE,
             TemplateURLPrepopulateData::GetEngineType(
-                TemplateURL(NULL, *t_urls[default_index]),
+                TemplateURL(*t_urls[default_index]),
                 SearchTermsData()));
   EXPECT_FALSE(t_urls[default_index]->search_terms_replacement_key.empty());
 }
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index 6c09f91..2a421d6 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -427,14 +427,7 @@ base::string16 TemplateURLService::CleanUserInputKeyword(
 }
 
 // static
-GURL TemplateURLService::GenerateSearchURL(TemplateURL* t_url) {
-  DCHECK(t_url);
-  UIThreadSearchTermsData search_terms_data(t_url->profile());
-  return GenerateSearchURLUsingTermsData(t_url, search_terms_data);
-}
-
-// static
-GURL TemplateURLService::GenerateSearchURLUsingTermsData(
+GURL TemplateURLService::GenerateSearchURL(
     const TemplateURL* t_url,
     const SearchTermsData& search_terms_data) {
   DCHECK(t_url);
@@ -613,15 +606,13 @@ TemplateURL* TemplateURLService::GetTemplateURLForGUID(
 
 TemplateURL* TemplateURLService::GetTemplateURLForHost(
     const std::string& host) {
-  if (loaded_) {
-    TemplateURL* t_url = provider_map_->GetTemplateURLForHost(host);
-    if (t_url)
-      return t_url;
-  }
-  return (!loaded_ &&
-      initial_default_search_provider_.get() &&
-      (GenerateSearchURL(initial_default_search_provider_.get()).host() ==
-          host)) ? initial_default_search_provider_.get() : NULL;
+  if (loaded_)
+    return provider_map_->GetTemplateURLForHost(host);
+  TemplateURL* initial_dsp = initial_default_search_provider_.get();
+  if (!initial_dsp)
+    return NULL;
+  return (GenerateSearchURL(initial_dsp, search_terms_data()).host() == host) ?
+      initial_dsp : NULL;
 }
 
 bool TemplateURLService::Add(TemplateURL* template_url) {
@@ -632,12 +623,6 @@ bool TemplateURLService::Add(TemplateURL* template_url) {
   return true;
 }
 
-void TemplateURLService::AddAndSetProfile(TemplateURL* template_url,
-                                          Profile* profile) {
-  template_url->profile_ = profile;
-  Add(template_url);
-}
-
 void TemplateURLService::AddWithOverrides(TemplateURL* template_url,
                                           const base::string16& short_name,
                                           const base::string16& keyword,
@@ -716,7 +701,8 @@ void TemplateURLService::RemoveAutoGeneratedForOriginBetween(
          template_urls_[i]->date_created() < created_before) &&
         CanReplace(template_urls_[i]) &&
         (o.is_empty() ||
-         GenerateSearchURL(template_urls_[i]).GetOrigin() == o)) {
+         GenerateSearchURL(template_urls_[i],
+                           search_terms_data()).GetOrigin() == o)) {
       RemoveNoNotify(template_urls_[i]);
       should_notify = true;
     } else {
@@ -858,7 +844,7 @@ void TemplateURLService::RepairPrepopulatedSearchEngines() {
   for (EditedEngines::iterator i(actions.edited_engines.begin());
        i < actions.edited_engines.end(); ++i) {
     UIThreadSearchTermsData search_terms_data(profile());
-    TemplateURL new_values(profile(), i->second);
+    TemplateURL new_values(i->second);
     UpdateNoNotify(i->first, new_values, search_terms_data);
   }
 
@@ -867,7 +853,7 @@ void TemplateURLService::RepairPrepopulatedSearchEngines() {
            actions.added_engines.begin();
        i < actions.added_engines.end();
        ++i) {
-    AddNoNotify(new TemplateURL(profile_, *i), true);
+    AddNoNotify(new TemplateURL(*i), true);
   }
 
   base::AutoReset<DefaultSearchChangeOrigin> change_origin(
@@ -1104,9 +1090,8 @@ syncer::SyncError TemplateURLService::ProcessSyncChanges(
         base::string16 updated_keyword = UniquifyKeyword(*existing_turl, true);
         TemplateURLData data(existing_turl->data());
         data.SetKeyword(updated_keyword);
-        TemplateURL new_turl(existing_turl->profile(), data);
-        UIThreadSearchTermsData search_terms_data(existing_turl->profile());
-        if (UpdateNoNotify(existing_turl, new_turl, search_terms_data))
+        TemplateURL new_turl(data);
+        if (UpdateNoNotify(existing_turl, new_turl, search_terms_data()))
           NotifyObservers();
 
         syncer::SyncData sync_data = CreateSyncDataFromTemplateURL(new_turl);
@@ -1137,7 +1122,7 @@ syncer::SyncError TemplateURLService::ProcessSyncChanges(
       // Force the local ID to kInvalidTemplateURLID so we can add it.
       TemplateURLData data(turl->data());
       data.id = kInvalidTemplateURLID;
-      TemplateURL* added = new TemplateURL(profile_, data);
+      TemplateURL* added = new TemplateURL(data);
       if (Add(added))
         MaybeUpdateDSEAfterSync(added);
     } else if (iter->change_type() == syncer::SyncChange::ACTION_UPDATE) {
@@ -1153,8 +1138,7 @@ syncer::SyncError TemplateURLService::ProcessSyncChanges(
         ResolveSyncKeywordConflict(turl.get(), existing_keyword_turl,
                                    &new_changes);
       }
-      UIThreadSearchTermsData search_terms_data(existing_turl->profile());
-      if (UpdateNoNotify(existing_turl, *turl, search_terms_data)) {
+      if (UpdateNoNotify(existing_turl, *turl, search_terms_data())) {
         NotifyObservers();
         MaybeUpdateDSEAfterSync(existing_turl);
       }
@@ -1253,8 +1237,7 @@ syncer::SyncMergeResult TemplateURLService::MergeDataAndStartSyncing(
         // TemplateURLID and the TemplateURL may have to be reparsed. This
         // also makes the local data's last_modified timestamp equal to Sync's,
         // avoiding an Update on the next MergeData call.
-        UIThreadSearchTermsData search_terms_data(local_turl->profile());
-        if (UpdateNoNotify(local_turl, *sync_turl, search_terms_data))
+        if (UpdateNoNotify(local_turl, *sync_turl, search_terms_data()))
           NotifyObservers();
         merge_result.set_num_items_modified(
             merge_result.num_items_modified() + 1);
@@ -1453,7 +1436,7 @@ TemplateURL* TemplateURLService::CreateTemplateURLFromTemplateURLAndSyncData(
     data.alternate_urls.push_back(specifics.alternate_urls(i));
   data.search_terms_replacement_key = specifics.search_terms_replacement_key();
 
-  TemplateURL* turl = new TemplateURL(profile, data);
+  TemplateURL* turl = new TemplateURL(data);
   UIThreadSearchTermsData search_terms_data(profile);
   // If this TemplateURL matches a built-in prepopulated template URL, it's
   // possible that sync is trying to modify fields that should not be touched.
@@ -1561,7 +1544,7 @@ void TemplateURLService::Init(const Initializer* initializers,
       data.short_name = base::UTF8ToUTF16(initializers[i].content);
       data.SetKeyword(base::UTF8ToUTF16(initializers[i].keyword));
       data.SetURL(initializers[i].url);
-      TemplateURL* template_url = new TemplateURL(profile_, data);
+      TemplateURL* template_url = new TemplateURL(data);
       AddNoNotify(template_url, true);
 
       // Set the first provided identifier to be the default.
@@ -1618,8 +1601,7 @@ void TemplateURLService::RemoveFromMaps(TemplateURL* template_url) {
     guid_to_template_map_.erase(template_url->sync_guid());
   // |provider_map_| is only initialized after loading has completed.
   if (loaded_) {
-    UIThreadSearchTermsData search_terms_data(template_url->profile());
-    provider_map_->Remove(template_url, search_terms_data);
+    provider_map_->Remove(template_url, search_terms_data());
   }
 }
 
@@ -1829,7 +1811,7 @@ void TemplateURLService::UpdateTemplateURLIfPrepopulated(
   for (size_t i = 0; i < prepopulated_urls.size(); ++i) {
     if (prepopulated_urls[i]->prepopulate_id == prepopulate_id) {
       MergeIntoPrepopulatedEngineData(template_url, prepopulated_urls[i]);
-      template_url->CopyFrom(TemplateURL(profile, *prepopulated_urls[i]));
+      template_url->CopyFrom(TemplateURL(*prepopulated_urls[i]));
     }
   }
 }
@@ -1912,7 +1894,7 @@ void TemplateURLService::GoogleBaseURLChanged(const GURL& old_base_url) {
        i != template_urls_.end(); ++i) {
     TemplateURL* t_url = *i;
     if (t_url->HasGoogleBaseURLs(search_terms_data())) {
-      TemplateURL updated_turl(t_url->profile(), t_url->data());
+      TemplateURL updated_turl(t_url->data());
       updated_turl.ResetKeywordIfNecessary(search_terms_data(), false);
       KeywordToTemplateMap::const_iterator existing_entry =
           keyword_to_template_map_.find(updated_turl.keyword());
@@ -1934,7 +1916,7 @@ void TemplateURLService::GoogleBaseURLChanged(const GURL& old_base_url) {
       // need to reset the keyword to an appropriate local value when this
       // change arrives; see CreateTemplateURLFromTemplateURLAndSyncData().
       UpdateNoNotify(t_url, updated_turl,
-          OldBaseURLSearchTermsData(t_url->profile(), old_base_url.spec()));
+          OldBaseURLSearchTermsData(profile(), old_base_url.spec()));
     }
   }
   if (something_changed)
@@ -1987,7 +1969,7 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
     bool changed = TemplateURL::MatchesData(
         initial_default_search_provider_.get(), data, search_terms_data());
     initial_default_search_provider_.reset(
-        data ? new TemplateURL(profile_, *data) : NULL);
+        data ? new TemplateURL(*data) : NULL);
     default_search_provider_source_ = source;
     return changed;
   }
@@ -2031,18 +2013,16 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
         update_data.SetKeyword(default_search_provider_->keyword());
         update_data.short_name = default_search_provider_->short_name();
       }
-      UIThreadSearchTermsData search_terms_data(
-          default_search_provider_->profile());
       UpdateNoNotify(default_search_provider_,
-                     TemplateURL(profile_, update_data),
-                     search_terms_data);
+                     TemplateURL(update_data),
+                     search_terms_data());
     } else {
       // Normally the prepopulated fallback should be present in
       // |template_urls_|, but in a few cases it might not be:
       // (1) Tests that initialize the TemplateURLService in peculiar ways.
       // (2) If the user deleted the pre-populated default and we subsequently
       // lost their user-selected value.
-      TemplateURL* new_dse = new TemplateURL(profile_, *data);
+      TemplateURL* new_dse = new TemplateURL(*data);
       if (AddNoNotify(new_dse, true))
         default_search_provider_ = new_dse;
     }
@@ -2055,14 +2035,12 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
     TemplateURLData new_data(*data);
     new_data.show_in_default_list = true;
     if (default_search_provider_) {
-      UIThreadSearchTermsData search_terms_data(
-          default_search_provider_->profile());
       UpdateNoNotify(default_search_provider_,
-                     TemplateURL(profile_, new_data),
-                     search_terms_data);
+                     TemplateURL(new_data),
+                     search_terms_data());
     } else {
       new_data.id = kInvalidTemplateURLID;
-      TemplateURL* new_dse = new TemplateURL(profile_, new_data);
+      TemplateURL* new_dse = new TemplateURL(new_data);
       if (AddNoNotify(new_dse, true))
         default_search_provider_ = new_dse;
     }
@@ -2213,8 +2191,7 @@ bool TemplateURLService::ResetTemplateURLNoNotify(
   }
   data.safe_for_autoreplace = false;
   data.last_modified = time_provider_();
-  UIThreadSearchTermsData search_terms_data(url->profile());
-  return UpdateNoNotify(url, TemplateURL(profile_, data), search_terms_data);
+  return UpdateNoNotify(url, TemplateURL(data), search_terms_data());
 }
 
 void TemplateURLService::NotifyObservers() {
@@ -2272,7 +2249,7 @@ void TemplateURLService::UpdateProvidersCreatedByPolicy(
     if (new_data.sync_guid.empty())
       new_data.sync_guid = base::GenerateGUID();
     new_data.created_by_policy = true;
-    TemplateURL* new_dse = new TemplateURL(profile_, new_data);
+    TemplateURL* new_dse = new TemplateURL(new_data);
     if (AddNoNotify(new_dse, true))
       default_search_provider_ = new_dse;
   }
@@ -2285,8 +2262,7 @@ void TemplateURLService::ResetTemplateURLGUID(TemplateURL* url,
 
   TemplateURLData data(url->data());
   data.sync_guid = guid;
-  UIThreadSearchTermsData search_terms_data(url->profile());
-  UpdateNoNotify(url, TemplateURL(profile_, data), search_terms_data);
+  UpdateNoNotify(url, TemplateURL(data), search_terms_data());
 }
 
 base::string16 TemplateURLService::UniquifyKeyword(const TemplateURL& turl,
@@ -2357,9 +2333,8 @@ void TemplateURLService::ResolveSyncKeywordConflict(
     // Update |applied_sync_turl| in the local model with the new keyword.
     TemplateURLData data(applied_sync_turl->data());
     data.SetKeyword(new_keyword);
-    UIThreadSearchTermsData search_terms_data(applied_sync_turl->profile());
     if (UpdateNoNotify(
-            applied_sync_turl, TemplateURL(profile_, data), search_terms_data))
+            applied_sync_turl, TemplateURL(data), search_terms_data()))
       NotifyObservers();
   }
   // The losing TemplateURL should have their keyword updated. Send a change to
@@ -2432,7 +2407,7 @@ void TemplateURLService::MergeInSyncTemplateURL(
     // Force the local ID to kInvalidTemplateURLID so we can add it.
     TemplateURLData data(sync_turl->data());
     data.id = kInvalidTemplateURLID;
-    TemplateURL* added = new TemplateURL(profile_, data);
+    TemplateURL* added = new TemplateURL(data);
     base::AutoReset<DefaultSearchChangeOrigin> change_origin(
         &dsp_change_origin_, DSP_CHANGE_SYNC_ADD);
     if (Add(added))
@@ -2494,7 +2469,7 @@ TemplateURL* TemplateURLService::CreateTemplateURLForExtension(
   // ID, as well as forcing the TemplateURL to be treated as a search keyword.
   data.SetURL(std::string(extensions::kExtensionScheme) + "://" +
       extension_keyword.extension_id + "/?q={searchTerms}");
-  return new TemplateURL(profile_, data);
+  return new TemplateURL(data);
 }
 
 TemplateURL* TemplateURLService::FindTemplateURLForExtension(
diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h
index 1712fa0..dc059c0 100644
--- a/chrome/browser/search_engines/template_url_service.h
+++ b/chrome/browser/search_engines/template_url_service.h
@@ -124,17 +124,8 @@ class TemplateURLService : public WebDataServiceConsumer,
 
   // Returns the search url for t_url.  Returns an empty GURL if t_url has no
   // url().
-  // NOTE: |t_url| is non-const in this version because of the need to access
-  // t_url->profile().
-  static GURL GenerateSearchURL(TemplateURL* t_url);
-
-  // Just like GenerateSearchURL except that it takes SearchTermsData to supply
-  // the data for some search terms, e.g. so this can be used on threads other
-  // than the UI thread.  See the various TemplateURLRef::XXXUsingTermsData()
-  // functions.
-  static GURL GenerateSearchURLUsingTermsData(
-      const TemplateURL* t_url,
-      const SearchTermsData& search_terms_data);
+  static GURL GenerateSearchURL(const TemplateURL* t_url,
+                                const SearchTermsData& search_terms_data);
 
   // Saves enough of url to |prefs| so that it can be loaded from preferences on
   // start up.
@@ -181,7 +172,6 @@ class TemplateURLService : public WebDataServiceConsumer,
 
   // Like Add(), but overwrites the |template_url|'s values with the provided
   // ones.
-  void AddAndSetProfile(TemplateURL* template_url, Profile* profile);
   void AddWithOverrides(TemplateURL* template_url,
                         const base::string16& short_name,
                         const base::string16& keyword,
diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
index 9070c50..7bad942 100644
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
@@ -276,7 +276,7 @@ TemplateURL* TemplateURLServiceSyncTest::CreateTestTemplateURL(
   data.prepopulate_id = 999999;
   if (!guid.empty())
     data.sync_guid = guid;
-  return new TemplateURL(NULL, data);
+  return new TemplateURL(data);
 }
 
 void TemplateURLServiceSyncTest::AssertEquals(const TemplateURL& expected,
@@ -355,7 +355,7 @@ TemplateURL* TemplateURLServiceSyncTest::CopyTemplateURL(
   data.date_created = Time::FromTimeT(100);
   data.last_modified = Time::FromTimeT(100);
   data.sync_guid = guid;
-  return new TemplateURL(NULL, data);
+  return new TemplateURL(data);
 }
 
 // Actual tests ---------------------------------------------------------------
@@ -1251,7 +1251,7 @@ TEST_F(TemplateURLServiceSyncTest, DuplicateEncodingsRemoved) {
   data.date_created = Time::FromTimeT(100);
   data.last_modified = Time::FromTimeT(100);
   data.sync_guid = "keyword";
-  scoped_ptr<TemplateURL> turl(new TemplateURL(NULL, data));
+  scoped_ptr<TemplateURL> turl(new TemplateURL(data));
   initial_data.push_back(
       TemplateURLService::CreateSyncDataFromTemplateURL(*turl));
 
@@ -1412,8 +1412,7 @@ TEST_F(TemplateURLServiceSyncTest, MergeTwiceWithSameSyncData) {
   // Keep a copy of it so we can compare it after we re-merge.
   TemplateURL* key1_url = model()->GetTemplateURLForGUID("key1");
   ASSERT_TRUE(key1_url);
-  scoped_ptr<TemplateURL> updated_turl(new TemplateURL(key1_url->profile(),
-                                                       key1_url->data()));
+  scoped_ptr<TemplateURL> updated_turl(new TemplateURL(key1_url->data()));
   EXPECT_EQ(Time::FromTimeT(90), updated_turl->last_modified());
 
   // Modify a single field of the initial data. This should not be updated in
@@ -1421,7 +1420,7 @@ TEST_F(TemplateURLServiceSyncTest, MergeTwiceWithSameSyncData) {
   scoped_ptr<TemplateURL> temp_turl(Deserialize(initial_data[0]));
   TemplateURLData data(temp_turl->data());
   data.short_name = ASCIIToUTF16("SomethingDifferent");
-  temp_turl.reset(new TemplateURL(temp_turl->profile(), data));
+  temp_turl.reset(new TemplateURL(data));
   initial_data.clear();
   initial_data.push_back(
       TemplateURLService::CreateSyncDataFromTemplateURL(*temp_turl));
@@ -1509,7 +1508,7 @@ TEST_F(TemplateURLServiceSyncTest, DefaultGuidDeletedBeforeNewDSPArrives) {
   data.prepopulate_id = 999999;
   data.sync_guid = "key2";
   data.show_in_default_list = true;
-  scoped_ptr<TemplateURL> turl2(new TemplateURL(NULL, data));
+  scoped_ptr<TemplateURL> turl2(new TemplateURL(data));
   initial_data.push_back(TemplateURLService::CreateSyncDataFromTemplateURL(
       *turl1));
   initial_data.push_back(TemplateURLService::CreateSyncDataFromTemplateURL(
@@ -1835,7 +1834,7 @@ TEST_F(TemplateURLServiceSyncTest, PreSyncUpdates) {
   data_copy.SetKeyword(ASCIIToUTF16(kNewKeyword));
   // Set safe_for_autoreplace to false so our keyword survives.
   data_copy.safe_for_autoreplace = false;
-  model()->Add(new TemplateURL(profile_a(), data_copy));
+  model()->Add(new TemplateURL(data_copy));
 
   // Merge the prepopulate search engines.
   base::Time pre_merge_time = base::Time::Now();
@@ -1858,7 +1857,7 @@ TEST_F(TemplateURLServiceSyncTest, PreSyncUpdates) {
   syncer::SyncDataList initial_data;
   data_copy.SetKeyword(original_keyword);
   data_copy.sync_guid = sync_guid;
-  scoped_ptr<TemplateURL> sync_turl(new TemplateURL(profile_a(), data_copy));
+  scoped_ptr<TemplateURL> sync_turl(new TemplateURL(data_copy));
   initial_data.push_back(
       TemplateURLService::CreateSyncDataFromTemplateURL(*sync_turl));
 
@@ -2132,7 +2131,7 @@ TEST_F(TemplateURLServiceSyncTest, UpdatePrepopulatedEngine) {
   TemplateURLData data = *default_turl;
   data.SetURL("http://old.wrong.url.com?q={searchTerms}");
   data.sync_guid = "default";
-  model()->Add(new TemplateURL(NULL, data));
+  model()->Add(new TemplateURL(data));
 
   syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing(
       syncer::SEARCH_ENGINES, syncer::SyncDataList(), PassProcessor(),
@@ -2167,11 +2166,11 @@ TEST_F(TemplateURLServiceSyncTest, MergeEditedPrepopulatedEngine) {
   data.date_created = Time::FromTimeT(50);
   data.last_modified = Time::FromTimeT(50);
   data.sync_guid = "default";
-  model()->Add(new TemplateURL(NULL, data));
+  model()->Add(new TemplateURL(data));
 
   data.date_created = Time::FromTimeT(100);
   data.last_modified = Time::FromTimeT(100);
-  scoped_ptr<TemplateURL> sync_turl(new TemplateURL(NULL, data));
+  scoped_ptr<TemplateURL> sync_turl(new TemplateURL(data));
   syncer::SyncDataList list;
   list.push_back(TemplateURLService::CreateSyncDataFromTemplateURL(*sync_turl));
   syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing(
@@ -2197,11 +2196,11 @@ TEST_F(TemplateURLServiceSyncTest, MergeNonEditedPrepopulatedEngine) {
   data.date_created = Time::FromTimeT(50);
   data.last_modified = Time::FromTimeT(50);
   data.sync_guid = "default";
-  model()->Add(new TemplateURL(NULL, data));
+  model()->Add(new TemplateURL(data));
 
   data.date_created = Time::FromTimeT(100);
   data.last_modified = Time::FromTimeT(100);
-  scoped_ptr<TemplateURL> sync_turl(new TemplateURL(NULL, data));
+  scoped_ptr<TemplateURL> sync_turl(new TemplateURL(data));
   syncer::SyncDataList list;
   list.push_back(TemplateURLService::CreateSyncDataFromTemplateURL(*sync_turl));
   syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing(
diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc
index 8aad0ec..2342266 100644
--- a/chrome/browser/search_engines/template_url_service_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_unittest.cc
@@ -110,7 +110,7 @@ TemplateURL* CreateKeywordWithDate(
   base::SplitString(encodings, ';', &data.input_encodings);
   data.date_created = date_created;
   data.last_modified = last_modified;
-  return new TemplateURL(model->profile(), data);
+  return new TemplateURL(data);
 }
 
 TemplateURL* AddKeywordWithDate(
@@ -195,36 +195,6 @@ class TemplateURLServiceTest : public testing::Test {
  protected:
   TemplateURLServiceTestUtil test_util_;
 
-  void TestGenerateSearchURL(SearchTermsData* search_terms_data) {
-    struct GenerateSearchURLCase {
-      const char* test_name;
-      const char* url;
-      const char* expected;
-    } generate_url_cases[] = {
-      { "invalid URL", "foo{searchTerms}", "" },
-      { "URL with no replacements", "http://foo/", "http://foo/" },
-      { "basic functionality", "http://foo/{searchTerms}",
-        "http://foo/blah.blah.blah.blah.blah" }
-    };
-
-    for (size_t i = 0; i < ARRAYSIZE_UNSAFE(generate_url_cases); ++i) {
-      TemplateURLData data;
-      data.SetURL(generate_url_cases[i].url);
-      TemplateURL t_url(NULL, data);
-      std::string result;
-      if (search_terms_data) {
-          result = TemplateURLService::GenerateSearchURLUsingTermsData(
-              &t_url, *search_terms_data).spec();
-      } else {
-          result = TemplateURLService::GenerateSearchURL(&t_url).spec();
-      }
-      EXPECT_EQ(result,  generate_url_cases[i].expected)
-          << generate_url_cases[i].test_name << " failed. Expected "
-          << generate_url_cases[i].expected << " Actual " << result;
-    }
-  }
-
-
   DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceTest);
 };
 
@@ -303,7 +273,7 @@ TemplateURL* TemplateURLServiceTest::CreatePreloadedTemplateURL(
   data.date_created = Time::FromTimeT(100);
   data.last_modified = Time::FromTimeT(100);
   data.prepopulate_id = prepopulate_id;
-  return new TemplateURL(test_util_.profile(), data);
+  return new TemplateURL(data);
 }
 
 void TemplateURLServiceTest::VerifyObserverCount(int expected_changed_count) {
@@ -337,7 +307,7 @@ TEST_F(TemplateURLServiceTest, AddUpdateRemove) {
   data.date_created = Time::FromTimeT(100);
   data.last_modified = Time::FromTimeT(100);
   data.sync_guid = "00000000-0000-0000-0000-000000000001";
-  TemplateURL* t_url = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* t_url = new TemplateURL(data);
   model()->Add(t_url);
   ASSERT_TRUE(model()->CanReplaceKeyword(ASCIIToUTF16("keyword"), GURL(),
                                          NULL));
@@ -348,8 +318,7 @@ TEST_F(TemplateURLServiceTest, AddUpdateRemove) {
   // We need to make a second copy as the model takes ownership of |t_url| and
   // will delete it.  We have to do this after calling Add() since that gives
   // |t_url| its ID.
-  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->profile(),
-                                                     t_url->data()));
+  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->data()));
 
   // Reload the model to verify it was actually saved to the database.
   test_util_.ResetModel(true);
@@ -378,7 +347,7 @@ TEST_F(TemplateURLServiceTest, AddUpdateRemove) {
   ASSERT_TRUE(model()->CanReplaceKeyword(ASCIIToUTF16("keyword"), GURL(),
                                          NULL));
   ASSERT_FALSE(model()->CanReplaceKeyword(ASCIIToUTF16("b"), GURL(), NULL));
-  cloned_url.reset(new TemplateURL(loaded_url->profile(), loaded_url->data()));
+  cloned_url.reset(new TemplateURL(loaded_url->data()));
   base::RunLoop().RunUntilIdle();
   test_util_.ResetModel(true);
   ASSERT_EQ(initial_count + 1, model()->GetTemplateURLs().size());
@@ -412,7 +381,7 @@ TEST_F(TemplateURLServiceTest, AddSameKeyword) {
   data.SetKeyword(ASCIIToUTF16("keyword"));
   data.SetURL("http://test2");
   data.safe_for_autoreplace = false;
-  TemplateURL* t_url = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* t_url = new TemplateURL(data);
   model()->Add(t_url);
 
   // Because the old TemplateURL was replaceable and the new one wasn't, the new
@@ -428,7 +397,7 @@ TEST_F(TemplateURLServiceTest, AddSameKeyword) {
   data.short_name = ASCIIToUTF16("third");
   data.SetURL("http://test3");
   data.safe_for_autoreplace = true;
-  model()->Add(new TemplateURL(test_util_.profile(), data));
+  model()->Add(new TemplateURL(data));
   VerifyObserverCount(0);
   EXPECT_EQ(t_url, model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword")));
   EXPECT_EQ(ASCIIToUTF16("second"), t_url->short_name());
@@ -440,7 +409,7 @@ TEST_F(TemplateURLServiceTest, AddSameKeyword) {
   data.short_name = ASCIIToUTF16("fourth");
   data.SetURL("http://test4");
   data.safe_for_autoreplace = false;
-  TemplateURL* t_url2 = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* t_url2 = new TemplateURL(data);
   model()->Add(t_url2);
   VerifyObserverCount(1);
   EXPECT_EQ(t_url2, model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword")));
@@ -473,14 +442,14 @@ TEST_F(TemplateURLServiceTest, AddExtensionKeyword) {
   data.safe_for_autoreplace = false;
 
   // Both replaceable and non-replaceable keywords should be uniquified.
-  TemplateURL* extension1 = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* extension1 = new TemplateURL(data);
   model()->Add(extension1);
   ASSERT_EQ(extension1,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword1")));
   EXPECT_EQ(original1,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("test1")));
   data.SetKeyword(ASCIIToUTF16("keyword2"));
-  TemplateURL* extension2 = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* extension2 = new TemplateURL(data);
   model()->Add(extension2);
   ASSERT_EQ(extension2,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword2")));
@@ -489,7 +458,7 @@ TEST_F(TemplateURLServiceTest, AddExtensionKeyword) {
 
   // They should override extension keywords added earlier.
   data.SetKeyword(ASCIIToUTF16("keyword3"));
-  TemplateURL* extension3 = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* extension3 = new TemplateURL(data);
   model()->Add(extension3);
   ASSERT_EQ(extension3,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword3")));
@@ -520,7 +489,7 @@ TEST_F(TemplateURLServiceTest, AddSameKeywordWithExtensionPresent) {
   data.SetKeyword(ASCIIToUTF16("keyword"));
   data.SetURL("http://test3");
   data.safe_for_autoreplace = true;
-  TemplateURL* t_url = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* t_url = new TemplateURL(data);
   model()->Add(t_url);
   EXPECT_EQ(extension,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword_")));
@@ -532,7 +501,7 @@ TEST_F(TemplateURLServiceTest, AddSameKeywordWithExtensionPresent) {
   data.short_name = ASCIIToUTF16("name2");
   data.SetURL("http://test4");
   data.safe_for_autoreplace = false;
-  TemplateURL* t_url2 = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* t_url2 = new TemplateURL(data);
   model()->Add(t_url2);
   EXPECT_EQ(t_url2,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword")));
@@ -556,14 +525,28 @@ TEST_F(TemplateURLServiceTest, GenerateKeyword) {
 }
 
 TEST_F(TemplateURLServiceTest, GenerateSearchURL) {
-  TestGenerateSearchURL(NULL);
-}
-
-TEST_F(TemplateURLServiceTest, GenerateSearchURLUsingTermsData) {
-  // Run the test for GenerateSearchURLUsingTermsData on the "IO" thread and
-  // wait for it to finish.
   TestSearchTermsData search_terms_data("http://google.com/");
-  TestGenerateSearchURL(&search_terms_data);
+
+  struct GenerateSearchURLCase {
+    const char* test_name;
+    const char* url;
+    const char* expected;
+  } generate_url_cases[] = {
+    { "invalid URL", "foo{searchTerms}", "" },
+    { "URL with no replacements", "http://foo/", "http://foo/" },
+    { "basic functionality", "http://foo/{searchTerms}",
+      "http://foo/blah.blah.blah.blah.blah" }
+  };
+
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(generate_url_cases); ++i) {
+    TemplateURLData data;
+    data.SetURL(generate_url_cases[i].url);
+    TemplateURL t_url(data);
+    std::string result = TemplateURLService::GenerateSearchURL(
+        &t_url, search_terms_data).spec();
+    EXPECT_EQ(result, generate_url_cases[i].expected)
+        << generate_url_cases[i].test_name << " failed.";
+  }
 }
 
 TEST_F(TemplateURLServiceTest, ClearBrowsingData_Keywords) {
@@ -691,7 +674,7 @@ TEST_F(TemplateURLServiceTest, Reset) {
   data.favicon_url = GURL("http://favicon.url");
   data.date_created = Time::FromTimeT(100);
   data.last_modified = Time::FromTimeT(100);
-  TemplateURL* t_url = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* t_url = new TemplateURL(data);
   model()->Add(t_url);
 
   VerifyObserverCount(1);
@@ -715,8 +698,7 @@ TEST_F(TemplateURLServiceTest, Reset) {
   ASSERT_TRUE(
       model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword")) == NULL);
 
-  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->profile(),
-                                                     t_url->data()));
+  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->data()));
 
   // Reload the model from the database and make sure the change took.
   test_util_.ResetModel(true);
@@ -745,8 +727,7 @@ TEST_F(TemplateURLServiceTest, DefaultSearchProvider) {
   VerifyObserverCount(1);
   base::RunLoop().RunUntilIdle();
 
-  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->profile(),
-                                                     t_url->data()));
+  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->data()));
 
   // Make sure when we reload we get a default search provider.
   test_util_.ResetModel(true);
@@ -817,14 +798,13 @@ TEST_F(TemplateURLServiceTest, DefaultSearchProviderLoadedFromPrefs) {
   data.instant_url = "http://instant";
   data.date_created = Time::FromTimeT(100);
   data.last_modified = Time::FromTimeT(100);
-  TemplateURL* t_url = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* t_url = new TemplateURL(data);
   model()->Add(t_url);
   const TemplateURLID id = t_url->id();
 
   model()->SetUserSelectedDefaultSearchProvider(t_url);
   base::RunLoop().RunUntilIdle();
-  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->profile(),
-                                                     t_url->data()));
+  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->data()));
 
   // Reset the model and don't load it. The template url we set as the default
   // should be pulled from prefs now.
@@ -885,7 +865,8 @@ TEST_F(TemplateURLServiceTest, RepairPrepopulatedSearchEngines) {
   // The keyword wasn't reverted.
   EXPECT_EQ(ASCIIToUTF16("trash"), google->short_name());
   EXPECT_EQ("www.google.com",
-            TemplateURLService::GenerateSearchURL(google).host());
+            TemplateURLService::GenerateSearchURL(
+                google, model()->search_terms_data()).host());
 
   // Bing was repaired.
   bing = model()->GetTemplateURLForKeyword(ASCIIToUTF16("bing.com"));
@@ -922,8 +903,7 @@ TEST_F(TemplateURLServiceTest, RepairSearchEnginesWithManagedDefault) {
   base::SplitString(kEncodings, ';', &data.input_encodings);
   data.alternate_urls.push_back(kAlternateURL);
   data.search_terms_replacement_key = kSearchTermsReplacementKey;
-  scoped_ptr<TemplateURL> expected_managed_default(new TemplateURL(
-      test_util_.profile(), data));
+  scoped_ptr<TemplateURL> expected_managed_default(new TemplateURL(data));
   EXPECT_TRUE(model()->is_default_search_managed());
   const TemplateURL* actual_managed_default =
       model()->GetDefaultSearchProvider();
@@ -1130,8 +1110,7 @@ TEST_F(TemplateURLServiceTest, LoadRetainsModifiedProvider) {
   model()->Add(t_url);
 
   // Do the copy after t_url is added so that the id is set.
-  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->profile(),
-                                                     t_url->data()));
+  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->data()));
   ASSERT_EQ(t_url, model()->GetTemplateURLForKeyword(ASCIIToUTF16("unittest")));
 
   // Wait for any saves to finish.
@@ -1161,8 +1140,7 @@ TEST_F(TemplateURLServiceTest, LoadSavesPrepopulatedDefaultSearchProvider) {
   // Verify that the default search provider is set to something.
   TemplateURL* default_search = model()->GetDefaultSearchProvider();
   ASSERT_TRUE(default_search != NULL);
-  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(default_search->profile(),
-                                                     default_search->data()));
+  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(default_search->data()));
 
   // Wait for any saves to finish.
   base::RunLoop().RunUntilIdle();
@@ -1188,8 +1166,7 @@ TEST_F(TemplateURLServiceTest, LoadRetainsDefaultProvider) {
   model()->SetUserSelectedDefaultSearchProvider(t_url);
   // Do the copy after t_url is added and set as default so that its
   // internal state is correct.
-  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->profile(),
-                                                     t_url->data()));
+  scoped_ptr<TemplateURL> cloned_url(new TemplateURL(t_url->data()));
 
   ASSERT_EQ(t_url, model()->GetTemplateURLForKeyword(ASCIIToUTF16("unittest")));
   ASSERT_EQ(t_url, model()->GetDefaultSearchProvider());
@@ -1307,9 +1284,7 @@ TEST_F(TemplateURLServiceTest, TestManagedDefaultSearch) {
   base::SplitString(kEncodings, ';', &data.input_encodings);
   data.alternate_urls.push_back(kAlternateURL);
   data.search_terms_replacement_key = kSearchTermsReplacementKey;
-  Profile* profile = test_util_.profile();
-  scoped_ptr<TemplateURL> expected_managed_default1(new TemplateURL(profile,
-                                                                    data));
+  scoped_ptr<TemplateURL> expected_managed_default1(new TemplateURL(data));
   const TemplateURL* actual_managed_default =
       model()->GetDefaultSearchProvider();
   ExpectSimilar(expected_managed_default1.get(), actual_managed_default);
@@ -1334,8 +1309,7 @@ TEST_F(TemplateURLServiceTest, TestManagedDefaultSearch) {
   data2.SetURL(kNewSearchURL);
   data2.suggestions_url = kNewSuggestURL;
   data2.show_in_default_list = true;
-  scoped_ptr<TemplateURL> expected_managed_default2(new TemplateURL(profile,
-                                                                    data2));
+  scoped_ptr<TemplateURL> expected_managed_default2(new TemplateURL(data2));
   actual_managed_default = model()->GetDefaultSearchProvider();
   ExpectSimilar(expected_managed_default2.get(), actual_managed_default);
   EXPECT_EQ(actual_managed_default->show_in_default_list(), true);
@@ -1409,7 +1383,7 @@ TEST_F(TemplateURLServiceTest, PatchEmptySyncGUID) {
   data.SetKeyword(ASCIIToUTF16("keyword"));
   data.SetURL("http://www.google.com/foo/bar");
   data.sync_guid.clear();
-  TemplateURL* t_url = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* t_url = new TemplateURL(data);
   model()->Add(t_url);
 
   VerifyObserverCount(1);
@@ -1446,7 +1420,7 @@ TEST_F(TemplateURLServiceTest, DuplicateInputEncodings) {
   data.input_encodings.push_back("UTF-16");
   data.input_encodings.push_back("Big5");
   data.input_encodings.push_back("Windows-1252");
-  TemplateURL* t_url = new TemplateURL(test_util_.profile(), data);
+  TemplateURL* t_url = new TemplateURL(data);
   model()->Add(t_url);
 
   VerifyObserverCount(1);
@@ -1552,8 +1526,7 @@ TEST_F(TemplateURLServiceTest, ExtensionEngineVsPolicy) {
   base::SplitString(kEncodings, ';', &data.input_encodings);
   data.alternate_urls.push_back(kAlternateURL);
   data.search_terms_replacement_key = kSearchTermsReplacementKey;
-  scoped_ptr<TemplateURL> expected_managed_default(new TemplateURL(
-      test_util_.profile(), data));
+  scoped_ptr<TemplateURL> expected_managed_default(new TemplateURL(data));
   EXPECT_TRUE(model()->is_default_search_managed());
   const TemplateURL* actual_managed_default =
       model()->GetDefaultSearchProvider();
diff --git a/chrome/browser/search_engines/template_url_service_util_unittest.cc b/chrome/browser/search_engines/template_url_service_util_unittest.cc
index f29ff5b..0a5ee33 100644
--- a/chrome/browser/search_engines/template_url_service_util_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_util_unittest.cc
@@ -31,7 +31,7 @@ scoped_ptr<TemplateURL> CreatePrepopulateTemplateURL(int prepopulate_id,
                                                      const std::string& keyword,
                                                      TemplateURLID id) {
   return make_scoped_ptr(new TemplateURL(
-      NULL, *CreatePrepopulateTemplateURLData(prepopulate_id, keyword, id)));
+      *CreatePrepopulateTemplateURLData(prepopulate_id, keyword, id)));
 }
 
 };  // namespace
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc
index fa317dd..42b55ba 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -80,7 +80,7 @@ TEST_F(TemplateURLTest, Defaults) {
 TEST_F(TemplateURLTest, TestValidWithComplete) {
   TemplateURLData data;
   data.SetURL("{searchTerms}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
 }
 
@@ -103,7 +103,7 @@ TEST_F(TemplateURLTest, URLRefTestSearchTerms) {
     const SearchTermsCase& value = search_term_cases[i];
     TemplateURLData data;
     data.SetURL(value.url);
-    TemplateURL url(NULL, data);
+    TemplateURL url(data);
     EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
     ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
     GURL result(url.url_ref().ReplaceSearchTerms(
@@ -116,7 +116,7 @@ TEST_F(TemplateURLTest, URLRefTestSearchTerms) {
 TEST_F(TemplateURLTest, URLRefTestCount) {
   TemplateURLData data;
   data.SetURL("http://foo{searchTerms}{count?}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   GURL result(url.url_ref().ReplaceSearchTerms(
@@ -128,7 +128,7 @@ TEST_F(TemplateURLTest, URLRefTestCount) {
 TEST_F(TemplateURLTest, URLRefTestCount2) {
   TemplateURLData data;
   data.SetURL("http://foo{searchTerms}{count}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   GURL result(url.url_ref().ReplaceSearchTerms(
@@ -140,7 +140,7 @@ TEST_F(TemplateURLTest, URLRefTestCount2) {
 TEST_F(TemplateURLTest, URLRefTestIndices) {
   TemplateURLData data;
   data.SetURL("http://foo{searchTerms}x{startIndex?}y{startPage?}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   GURL result(url.url_ref().ReplaceSearchTerms(
@@ -152,7 +152,7 @@ TEST_F(TemplateURLTest, URLRefTestIndices) {
 TEST_F(TemplateURLTest, URLRefTestIndices2) {
   TemplateURLData data;
   data.SetURL("http://foo{searchTerms}x{startIndex}y{startPage}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   GURL result(url.url_ref().ReplaceSearchTerms(
@@ -164,7 +164,7 @@ TEST_F(TemplateURLTest, URLRefTestIndices2) {
 TEST_F(TemplateURLTest, URLRefTestEncoding) {
   TemplateURLData data;
   data.SetURL("http://foo{searchTerms}x{inputEncoding?}y{outputEncoding?}a");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   GURL result(url.url_ref().ReplaceSearchTerms(
@@ -190,7 +190,7 @@ TEST_F(TemplateURLTest, URLRefTestImageURLWithPOST) {
 
   // Try to parse invalid post parameters.
   data.image_url_post_params = kInvalidPostParamsString;
-  TemplateURL url_bad(NULL, data);
+  TemplateURL url_bad(data);
   ASSERT_FALSE(url_bad.image_url_ref().IsValid(search_terms_data_));
   const TemplateURLRef::PostParams& bad_post_params =
       url_bad.image_url_ref().post_params_;
@@ -202,7 +202,7 @@ TEST_F(TemplateURLTest, URLRefTestImageURLWithPOST) {
 
   // Try to parse valid post parameters.
   data.image_url_post_params = kValidPostParamsString;
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   ASSERT_TRUE(url.image_url_ref().IsValid(search_terms_data_));
   ASSERT_FALSE(url.image_url_ref().SupportsReplacement(search_terms_data_));
 
@@ -281,7 +281,7 @@ TEST_F(TemplateURLTest, URLRefTestImageURLWithPOST) {
 TEST_F(TemplateURLTest, SetPrepopulatedAndParse) {
   TemplateURLData data;
   data.SetURL("http://foo{fhqwhgads}bar");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   TemplateURLRef::Replacements replacements;
   bool valid = false;
   EXPECT_EQ("http://foo{fhqwhgads}bar", url.url_ref().ParseURL(
@@ -290,7 +290,7 @@ TEST_F(TemplateURLTest, SetPrepopulatedAndParse) {
   EXPECT_TRUE(valid);
 
   data.prepopulate_id = 123;
-  TemplateURL url2(NULL, data);
+  TemplateURL url2(data);
   EXPECT_EQ("http://foobar", url2.url_ref().ParseURL("http://foo{fhqwhgads}bar",
                                                      &replacements, NULL,
                                                      &valid));
@@ -301,7 +301,7 @@ TEST_F(TemplateURLTest, SetPrepopulatedAndParse) {
 TEST_F(TemplateURLTest, InputEncodingBeforeSearchTerm) {
   TemplateURLData data;
   data.SetURL("http://foox{inputEncoding?}a{searchTerms}y{outputEncoding?}b");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   GURL result(url.url_ref().ReplaceSearchTerms(
@@ -313,7 +313,7 @@ TEST_F(TemplateURLTest, InputEncodingBeforeSearchTerm) {
 TEST_F(TemplateURLTest, URLRefTestEncoding2) {
   TemplateURLData data;
   data.SetURL("http://foo{searchTerms}x{inputEncoding}y{outputEncoding}a");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   GURL result(url.url_ref().ReplaceSearchTerms(
@@ -339,7 +339,7 @@ TEST_F(TemplateURLTest, URLRefTestSearchTermsUsingTermsData) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(search_term_cases); ++i) {
     const SearchTermsCase& value = search_term_cases[i];
     data.SetURL(value.url);
-    TemplateURL url(NULL, data);
+    TemplateURL url(data);
     EXPECT_TRUE(url.url_ref().IsValid(search_terms_data));
     ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data));
     GURL result(url.url_ref().ReplaceSearchTerms(
@@ -374,7 +374,7 @@ TEST_F(TemplateURLTest, URLRefTermToWide) {
   TemplateURLData data;
   data.SetURL("http://foo?q={searchTerms}");
   data.input_encodings.push_back("big-5");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(to_wide_cases); i++) {
@@ -401,7 +401,7 @@ TEST_F(TemplateURLTest, DisplayURLToURLRef) {
   TemplateURLData data;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
     data.SetURL(test_data[i].url);
-    TemplateURL url(NULL, data);
+    TemplateURL url(data);
     EXPECT_EQ(test_data[i].expected_result,
               url.url_ref().DisplayURL(search_terms_data_));
     EXPECT_EQ(test_data[i].url,
@@ -444,7 +444,7 @@ TEST_F(TemplateURLTest, ReplaceSearchTerms) {
   data.input_encodings.push_back("UTF-8");
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
     data.SetURL(test_data[i].url);
-    TemplateURL url(NULL, data);
+    TemplateURL url(data);
     EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
     ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
     std::string expected_result = test_data[i].expected_result;
@@ -486,7 +486,7 @@ TEST_F(TemplateURLTest, ReplaceArbitrarySearchTerms) {
     data.SetURL(test_data[i].url);
     data.input_encodings.clear();
     data.input_encodings.push_back(test_data[i].encoding);
-    TemplateURL url(NULL, data);
+    TemplateURL url(data);
     EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
     ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
     GURL result(url.url_ref().ReplaceSearchTerms(
@@ -541,7 +541,7 @@ TEST_F(TemplateURLTest, ReplaceAssistedQueryStats) {
   data.input_encodings.push_back("UTF-8");
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
     data.SetURL(test_data[i].url);
-    TemplateURL url(NULL, data);
+    TemplateURL url(data);
     EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
     ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
     TemplateURLRef::SearchTermsArgs search_terms_args(test_data[i].search_term);
@@ -580,7 +580,7 @@ TEST_F(TemplateURLTest, ReplaceCursorPosition) {
   data.input_encodings.push_back("UTF-8");
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
     data.SetURL(test_data[i].url);
-    TemplateURL url(NULL, data);
+    TemplateURL url(data);
     EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
     ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
     TemplateURLRef::SearchTermsArgs search_terms_args(test_data[i].search_term);
@@ -618,7 +618,7 @@ TEST_F(TemplateURLTest, ReplaceInputType) {
   data.input_encodings.push_back("UTF-8");
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
     data.SetURL(test_data[i].url);
-    TemplateURL url(NULL, data);
+    TemplateURL url(data);
     EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
     ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
     TemplateURLRef::SearchTermsArgs search_terms_args(test_data[i].search_term);
@@ -656,7 +656,7 @@ TEST_F(TemplateURLTest, ReplaceCurrentPageUrl) {
   data.input_encodings.push_back("UTF-8");
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
     data.SetURL(test_data[i].url);
-    TemplateURL url(NULL, data);
+    TemplateURL url(data);
     EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
     ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
     TemplateURLRef::SearchTermsArgs search_terms_args(test_data[i].search_term);
@@ -689,7 +689,7 @@ TEST_F(TemplateURLTest, Suggestions) {
   data.SetURL("http://bar/foo?{google:originalQueryForSuggestion}"
               "q={searchTerms}");
   data.input_encodings.push_back("UTF-8");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
@@ -721,7 +721,7 @@ TEST_F(TemplateURLTest, RLZ) {
 
   TemplateURLData data;
   data.SetURL("http://bar/?{google:RLZ}{searchTerms}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   GURL result(url.url_ref().ReplaceSearchTerms(
@@ -747,7 +747,7 @@ TEST_F(TemplateURLTest, RLZFromAppList) {
 
   TemplateURLData data;
   data.SetURL("http://bar/?{google:RLZ}{searchTerms}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   TemplateURLRef::SearchTermsArgs args(ASCIIToUTF16("x"));
@@ -793,7 +793,7 @@ TEST_F(TemplateURLTest, HostAndSearchTermKey) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
     TemplateURLData data;
     data.SetURL(test_data[i].url);
-    TemplateURL url(NULL, data);
+    TemplateURL url(data);
     EXPECT_EQ(test_data[i].host, url.url_ref().GetHost(search_terms_data_));
     EXPECT_EQ(test_data[i].path, url.url_ref().GetPath(search_terms_data_));
     EXPECT_EQ(test_data[i].search_term_key,
@@ -821,7 +821,7 @@ TEST_F(TemplateURLTest, ParseParameterKnown) {
   std::string parsed_url("{searchTerms}");
   TemplateURLData data;
   data.SetURL(parsed_url);
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   TemplateURLRef::Replacements replacements;
   EXPECT_TRUE(url.url_ref().ParseParameter(0, 12, &parsed_url, &replacements));
   EXPECT_EQ(std::string(), parsed_url);
@@ -834,7 +834,7 @@ TEST_F(TemplateURLTest, ParseParameterUnknown) {
   std::string parsed_url("{fhqwhgads}abc");
   TemplateURLData data;
   data.SetURL(parsed_url);
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   TemplateURLRef::Replacements replacements;
 
   // By default, TemplateURLRef should not consider itself prepopulated.
@@ -846,14 +846,14 @@ TEST_F(TemplateURLTest, ParseParameterUnknown) {
   // If the TemplateURLRef is prepopulated, we should remove unknown parameters.
   parsed_url = "{fhqwhgads}abc";
   data.prepopulate_id = 1;
-  TemplateURL url2(NULL, data);
+  TemplateURL url2(data);
   EXPECT_TRUE(url2.url_ref().ParseParameter(0, 10, &parsed_url, &replacements));
   EXPECT_EQ("abc", parsed_url);
   EXPECT_TRUE(replacements.empty());
 }
 
 TEST_F(TemplateURLTest, ParseURLEmpty) {
-  TemplateURL url(NULL, TemplateURLData());
+  TemplateURL url((TemplateURLData()));
   TemplateURLRef::Replacements replacements;
   bool valid = false;
   EXPECT_EQ(std::string(),
@@ -865,7 +865,7 @@ TEST_F(TemplateURLTest, ParseURLEmpty) {
 TEST_F(TemplateURLTest, ParseURLNoTemplateEnd) {
   TemplateURLData data;
   data.SetURL("{");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   TemplateURLRef::Replacements replacements;
   bool valid = false;
   EXPECT_EQ(std::string(), url.url_ref().ParseURL("{", &replacements, NULL,
@@ -877,7 +877,7 @@ TEST_F(TemplateURLTest, ParseURLNoTemplateEnd) {
 TEST_F(TemplateURLTest, ParseURLNoKnownParameters) {
   TemplateURLData data;
   data.SetURL("{}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   TemplateURLRef::Replacements replacements;
   bool valid = false;
   EXPECT_EQ("{}", url.url_ref().ParseURL("{}", &replacements, NULL, &valid));
@@ -888,7 +888,7 @@ TEST_F(TemplateURLTest, ParseURLNoKnownParameters) {
 TEST_F(TemplateURLTest, ParseURLTwoParameters) {
   TemplateURLData data;
   data.SetURL("{}{{%s}}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   TemplateURLRef::Replacements replacements;
   bool valid = false;
   EXPECT_EQ("{}{}",
@@ -903,7 +903,7 @@ TEST_F(TemplateURLTest, ParseURLTwoParameters) {
 TEST_F(TemplateURLTest, ParseURLNestedParameter) {
   TemplateURLData data;
   data.SetURL("{%s");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   TemplateURLRef::Replacements replacements;
   bool valid = false;
   EXPECT_EQ("{",
@@ -925,7 +925,7 @@ TEST_F(TemplateURLTest, SearchClient) {
 
   TemplateURLData data;
   data.SetURL(full_url_str);
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foobar"));
@@ -951,7 +951,7 @@ TEST_F(TemplateURLTest, GetURLNoInstantURL) {
   data.suggestions_url = "http://google.com/suggest?q={searchTerms}";
   data.alternate_urls.push_back("http://google.com/alt?q={searchTerms}");
   data.alternate_urls.push_back("{google:baseURL}/alt/#q={searchTerms}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   ASSERT_EQ(3U, url.URLCount());
   EXPECT_EQ("http://google.com/alt?q={searchTerms}", url.GetURL(0));
   EXPECT_EQ("{google:baseURL}/alt/#q={searchTerms}", url.GetURL(1));
@@ -964,7 +964,7 @@ TEST_F(TemplateURLTest, GetURLNoSuggestionsURL) {
   data.instant_url = "http://google.com/instant#q={searchTerms}";
   data.alternate_urls.push_back("http://google.com/alt?q={searchTerms}");
   data.alternate_urls.push_back("{google:baseURL}/alt/#q={searchTerms}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   ASSERT_EQ(3U, url.URLCount());
   EXPECT_EQ("http://google.com/alt?q={searchTerms}", url.GetURL(0));
   EXPECT_EQ("{google:baseURL}/alt/#q={searchTerms}", url.GetURL(1));
@@ -974,7 +974,7 @@ TEST_F(TemplateURLTest, GetURLNoSuggestionsURL) {
 TEST_F(TemplateURLTest, GetURLOnlyOneURL) {
   TemplateURLData data;
   data.SetURL("http://www.google.co.uk/");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   ASSERT_EQ(1U, url.URLCount());
   EXPECT_EQ("http://www.google.co.uk/", url.GetURL(0));
 }
@@ -986,7 +986,7 @@ TEST_F(TemplateURLTest, ExtractSearchTermsFromURL) {
   data.alternate_urls.push_back("http://google.com/alt/#q={searchTerms}");
   data.alternate_urls.push_back(
       "http://google.com/alt/?ext=foo&q={searchTerms}#ref=bar");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   base::string16 result;
 
   EXPECT_TRUE(url.ExtractSearchTermsFromURL(
@@ -1097,7 +1097,7 @@ TEST_F(TemplateURLTest, HasSearchTermsReplacementKey) {
   data.alternate_urls.push_back(
       "http://google.com/alt/?ext=foo&q={searchTerms}#ref=bar");
   data.search_terms_replacement_key = "espv";
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
 
   // Test with instant enabled required.
   EXPECT_FALSE(url.HasSearchTermsReplacementKey(
@@ -1178,7 +1178,7 @@ TEST_F(TemplateURLTest, ReplaceSearchTermsInURL) {
   data.alternate_urls.push_back("http://google.com/alt/#q={searchTerms}");
   data.alternate_urls.push_back(
       "http://google.com/alt/?ext=foo&q={searchTerms}#ref=bar");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   TemplateURLRef::SearchTermsArgs search_terms(ASCIIToUTF16("Bob Morane"));
   GURL result;
 
@@ -1260,7 +1260,7 @@ TEST_F(TemplateURLTest, SuggestQueryParams) {
   // we don't goof up any of them.
   data.SetURL("{google:baseURL}search?q={searchTerms}"
       "#{google:originalQueryForSuggestion}x");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
 
   // Baseline: no |suggest_query_params| field.
   TemplateURLRef::SearchTermsArgs search_terms(ASCIIToUTF16("abc"));
@@ -1290,7 +1290,7 @@ TEST_F(TemplateURLTest, ExtraQueryParams) {
   // we don't goof up any of them.
   data.SetURL("{google:baseURL}search?q={searchTerms}"
       "#{google:originalQueryForSuggestion}x");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
 
   // Baseline: no command-line args, no |append_extra_query_params| flag.
   TemplateURLRef::SearchTermsArgs search_terms(ASCIIToUTF16("abc"));
@@ -1323,7 +1323,7 @@ TEST_F(TemplateURLTest, ReplacePageClassification) {
   TemplateURLData data;
   data.input_encodings.push_back("UTF-8");
   data.SetURL("{google:baseURL}?{google:pageClassification}q={searchTerms}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
@@ -1354,7 +1354,7 @@ TEST_F(TemplateURLTest, IsSearchResults) {
   data.alternate_urls.push_back("http://bar/#q={searchTerms}");
   data.alternate_urls.push_back("http://bar/search#q{searchTerms}");
   data.alternate_urls.push_back("http://bar/webhp#q={searchTerms}");
-  TemplateURL search_provider(NULL, data);
+  TemplateURL search_provider(data);
 
   const struct {
     const char* const url;
@@ -1384,7 +1384,7 @@ TEST_F(TemplateURLTest, ReflectsBookmarkBarPinned) {
   TemplateURLData data;
   data.input_encodings.push_back("UTF-8");
   data.SetURL("{google:baseURL}?{google:bookmarkBarPinned}q={searchTerms}");
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   EXPECT_TRUE(url.url_ref().IsValid(search_terms_data_));
   ASSERT_TRUE(url.url_ref().SupportsReplacement(search_terms_data_));
   TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
@@ -1414,7 +1414,7 @@ TEST_F(TemplateURLTest, AnswersHasVersion) {
   UIThreadSearchTermsData::SetGoogleBaseURL("http://bar/");
   data.SetURL("http://bar/search?q={searchTerms}&{google:searchVersion}xssi=t");
 
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
   std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args,
                                                         search_terms_data_);
@@ -1422,7 +1422,7 @@ TEST_F(TemplateURLTest, AnswersHasVersion) {
 
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableAnswersInSuggest);
-  TemplateURL url2(NULL, data);
+  TemplateURL url2(data);
   result = url2.url_ref().ReplaceSearchTerms(search_terms_args,
                                              search_terms_data_);
   EXPECT_EQ("http://bar/search?q=foo&gs_rn=42&xssi=t", result);
@@ -1433,14 +1433,14 @@ TEST_F(TemplateURLTest, SessionToken) {
   UIThreadSearchTermsData::SetGoogleBaseURL("http://bar/");
   data.SetURL("http://bar/search?q={searchTerms}&{google:sessionToken}xssi=t");
 
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
   search_terms_args.session_token = "SESSIONTOKENGOESHERE";
   std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args,
                                                         search_terms_data_);
   EXPECT_EQ("http://bar/search?q=foo&psi=SESSIONTOKENGOESHERE&xssi=t", result);
 
-  TemplateURL url2(NULL, data);
+  TemplateURL url2(data);
   search_terms_args.session_token = "";
   result = url.url_ref().ReplaceSearchTerms(search_terms_args,
                                             search_terms_data_);
@@ -1454,7 +1454,7 @@ TEST_F(TemplateURLTest, ContextualSearchParameters) {
               "{google:contextualSearchVersion}"
               "{google:contextualSearchContextData}");
 
-  TemplateURL url(NULL, data);
+  TemplateURL url(data);
   TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
   std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args,
                                                         search_terms_data_);
diff --git a/chrome/browser/search_engines/util.cc b/chrome/browser/search_engines/util.cc
index 6b76ff9..791f0e3 100644
--- a/chrome/browser/search_engines/util.cc
+++ b/chrome/browser/search_engines/util.cc
@@ -240,7 +240,7 @@ void MergeEnginesFromPrepopulateData(
     // Replace the entry in |template_urls| with the updated one.
     TemplateURLService::TemplateURLVector::iterator j = std::find(
         template_urls->begin(), template_urls->end(), existing_url.get());
-    *j = new TemplateURL(profile, data);
+    *j = new TemplateURL(data);
   }
 
   // Add items.
@@ -248,7 +248,7 @@ void MergeEnginesFromPrepopulateData(
            actions.added_engines.begin();
        it != actions.added_engines.end();
        ++it) {
-    template_urls->push_back(new TemplateURL(profile, *it));
+    template_urls->push_back(new TemplateURL(*it));
   }
 }
 
@@ -350,7 +350,7 @@ void GetSearchProvidersUsingKeywordResult(
     // search engine sync, since in that case that code will never be reached.
     if (DeDupeEncodings(&i->input_encodings) && service)
       service->UpdateKeyword(*i);
-    template_urls->push_back(new TemplateURL(profile, *i));
+    template_urls->push_back(new TemplateURL(*i));
   }
 
   *new_resource_keyword_version = keyword_result.builtin_keyword_version;
diff --git a/chrome/browser/sync/test/integration/search_engines_helper.cc b/chrome/browser/sync/test/integration/search_engines_helper.cc
index 38016d3..9a4fb3c 100644
--- a/chrome/browser/sync/test/integration/search_engines_helper.cc
+++ b/chrome/browser/sync/test/integration/search_engines_helper.cc
@@ -204,7 +204,7 @@ TemplateURL* CreateTestTemplateURL(Profile* profile,
   data.last_modified = base::Time::FromTimeT(100);
   data.prepopulate_id = 999999;
   data.sync_guid = sync_guid;
-  return new TemplateURL(profile, data);
+  return new TemplateURL(data);
 }
 
 void AddSearchEngine(int profile_index, int seed) {
diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm
index 12aa6ae..ca59034 100644
--- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm
@@ -238,7 +238,7 @@ TEST_F(EditSearchEngineControllerTest, EditTemplateURL) {
   std::string urlString = TemplateURLRef::DisplayURLToURLRef(
       base::ASCIIToUTF16("http://foo-bar.com"));
   data.SetURL(urlString);
-  TemplateURL url(profile(), data);
+  TemplateURL url(data);
   FakeEditSearchEngineController *controller =
       [[FakeEditSearchEngineController alloc] initWithProfile:profile()
                                                      delegate:nil
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index a9f27db..68348c6 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -248,12 +248,12 @@ class OmniboxViewTest : public InProcessBrowserTest,
     data.short_name = ASCIIToUTF16(kSearchShortName);
     data.SetKeyword(ASCIIToUTF16(kSearchKeyword));
     data.SetURL(kSearchURL);
-    TemplateURL* template_url = new TemplateURL(profile, data);
+    TemplateURL* template_url = new TemplateURL(data);
     model->Add(template_url);
     model->SetUserSelectedDefaultSearchProvider(template_url);
 
     data.SetKeyword(ASCIIToUTF16(kSearchKeyword2));
-    model->Add(new TemplateURL(profile, data));
+    model->Add(new TemplateURL(data));
 
     // Remove built-in template urls, like google.com, bing.com etc., as they
     // may appear as autocomplete suggests and interfere with our tests.
@@ -597,7 +597,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DesiredTLDWithTemporaryText) {
   data.short_name = ASCIIToUTF16("abc");
   data.SetKeyword(ASCIIToUTF16(kSearchText));
   data.SetURL("http://abc.com/");
-  template_url_service->Add(new TemplateURL(profile, data));
+  template_url_service->Add(new TemplateURL(data));
 
   // Send "ab", so that an "abc" entry appears in the popup.
   const wchar_t kSearchTextPrefixKeys[] = { ui::VKEY_A, ui::VKEY_B, 0 };
@@ -1019,7 +1019,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_NonSubstitutingKeywordTest) {
   data.short_name = ASCIIToUTF16("Search abc");
   data.SetKeyword(ASCIIToUTF16(kSearchText));
   data.SetURL("http://abc.com/{searchTerms}");
-  TemplateURL* template_url = new TemplateURL(profile, data);
+  TemplateURL* template_url = new TemplateURL(data);
   template_url_service->Add(template_url);
 
   omnibox_view->SetUserText(base::string16());
@@ -1043,7 +1043,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_NonSubstitutingKeywordTest) {
   template_url_service->Remove(template_url);
   data.short_name = ASCIIToUTF16("abc");
   data.SetURL("http://abc.com/");
-  template_url_service->Add(new TemplateURL(profile, data));
+  template_url_service->Add(new TemplateURL(data));
 
   // We always allow exact matches for non-substituting keywords.
   ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
diff --git a/chrome/browser/ui/search/instant_test_utils.cc b/chrome/browser/ui/search/instant_test_utils.cc
index a17425d..d261d55 100644
--- a/chrome/browser/ui/search/instant_test_utils.cc
+++ b/chrome/browser/ui/search/instant_test_utils.cc
@@ -65,7 +65,7 @@ void InstantTestBase::SetupInstant(Browser* browser) {
   data.alternate_urls.push_back(instant_url_.spec() + "#q={searchTerms}");
   data.search_terms_replacement_key = "strk";
 
-  TemplateURL* template_url = new TemplateURL(browser_->profile(), data);
+  TemplateURL* template_url = new TemplateURL(data);
   service->Add(template_url);  // Takes ownership of |template_url|.
   service->SetUserSelectedDefaultSearchProvider(template_url);
 }
@@ -80,7 +80,7 @@ void InstantTestBase::SetInstantURL(const std::string& url) {
   data.SetURL(url);
   data.instant_url = url;
 
-  TemplateURL* template_url = new TemplateURL(browser_->profile(), data);
+  TemplateURL* template_url = new TemplateURL(data);
   service->Add(template_url);  // Takes ownership of |template_url|.
   service->SetUserSelectedDefaultSearchProvider(template_url);
 }
diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc
index f582d17..fc9d79c 100644
--- a/chrome/browser/ui/search/search_ipc_router_unittest.cc
+++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc
@@ -111,7 +111,7 @@ class SearchIPCRouterTest : public BrowserWithTestWindowTest {
     data.alternate_urls.push_back("http://foo.com/alt#quux={searchTerms}");
     data.search_terms_replacement_key = "espv";
 
-    TemplateURL* template_url = new TemplateURL(profile(), data);
+    TemplateURL* template_url = new TemplateURL(data);
     // Takes ownership of |template_url|.
     template_url_service->Add(template_url);
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
diff --git a/chrome/browser/ui/search/search_tab_helper_unittest.cc b/chrome/browser/ui/search/search_tab_helper_unittest.cc
index cd277ac..8464769 100644
--- a/chrome/browser/ui/search/search_tab_helper_unittest.cc
+++ b/chrome/browser/ui/search/search_tab_helper_unittest.cc
@@ -282,7 +282,7 @@ class SearchTabHelperWindowTest : public BrowserWithTestWindowTest {
     data.alternate_urls.push_back("http://foo.com/alt#quux={searchTerms}");
     data.search_terms_replacement_key = "strk";
 
-    TemplateURL* template_url = new TemplateURL(profile(), data);
+    TemplateURL* template_url = new TemplateURL(data);
     template_url_service->Add(template_url);
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
   }
diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
index 38f83303..9081217 100644
--- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
+++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
@@ -43,7 +43,7 @@ bool EditSearchEngineController::IsURLValid(
   // TemplateURLRef::IsValid() when its owner is NULL.
   TemplateURLData data;
   data.SetURL(url);
-  TemplateURL t_url(profile_, data);
+  TemplateURL t_url(data);
   const TemplateURLRef& template_ref = t_url.url_ref();
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(profile_);
@@ -137,7 +137,7 @@ std::string EditSearchEngineController::GetFixedUpURL(
   // we need to replace the search terms before testing for the scheme.
   TemplateURLData data;
   data.SetURL(url);
-  TemplateURL t_url(profile_, data);
+  TemplateURL t_url(data);
   std::string expanded_url(t_url.url_ref().ReplaceSearchTerms(
       TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("x")),
       TemplateURLServiceFactory::GetForProfile(profile_)->search_terms_data()));
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
index 93fbef8..15986cd 100644
--- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
@@ -249,7 +249,7 @@ TEST_F(KeywordEditorControllerTest, MutateTemplateURLService) {
   TemplateURLData data;
   data.short_name = ASCIIToUTF16("b");
   data.SetKeyword(ASCIIToUTF16("a"));
-  TemplateURL* turl = new TemplateURL(util()->profile(), data);
+  TemplateURL* turl = new TemplateURL(data);
   util()->model()->Add(turl);
 
   // Table model should have updated.
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
index f5423a5..fc2987c 100644
--- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
@@ -201,5 +201,5 @@ void SearchEngineTabHelper::GenerateKeywordIfNecessary(
       current_favicon : TemplateURL::GenerateFaviconURL(params.referrer.url);
   data.safe_for_autoreplace = true;
   data.input_encodings.push_back(params.searchable_form_encoding);
-  url_service->Add(new TemplateURL(profile, data));
+  url_service->Add(new TemplateURL(data));
 }
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc
index 70556b7..0167f1d 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -274,7 +274,7 @@ void TemplateURLTableModel::Add(int index,
   data.short_name = short_name;
   data.SetKeyword(keyword);
   data.SetURL(url);
-  TemplateURL* turl = new TemplateURL(template_url_service_->profile(), data);
+  TemplateURL* turl = new TemplateURL(data);
   template_url_service_->Add(turl);
   scoped_ptr<ModelEntry> entry(new ModelEntry(this, turl));
   template_url_service_->AddObserver(this);
diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc
index 40b8243..1c207ac 100644
--- a/chrome/browser/webdata/keyword_table.cc
+++ b/chrome/browser/webdata/keyword_table.cc
@@ -604,7 +604,7 @@ bool KeywordTable::MigrateKeywordsTableForVersion45(const std::string& name) {
     TemplateURLData data;
     data.SetKeyword(keyword);
     data.SetURL(s.ColumnString(2));
-    TemplateURL turl(NULL, data);
+    TemplateURL turl(data);
     // Don't persist extension keywords to disk.  These will get added to the
     // TemplateURLService as the extensions are loaded.
     bool delete_entry = turl.GetType() == TemplateURL::OMNIBOX_API_EXTENSION;
@@ -612,8 +612,7 @@ bool KeywordTable::MigrateKeywordsTableForVersion45(const std::string& name) {
       // Explicitly generate keywords for all rows with the autogenerate bit set
       // or where the keyword is empty.
       SearchTermsData terms_data;
-      GURL url(TemplateURLService::GenerateSearchURLUsingTermsData(&turl,
-                                                                   terms_data));
+      GURL url(TemplateURLService::GenerateSearchURL(&turl, terms_data));
       if (!url.is_valid()) {
         delete_entry = true;
       } else {