Remove Profile* from TemplateURL

chrome/browser/search/search_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/prefs/pref_service.h"
@@ skipping 165 matching lines @@
     data.instant_url = "http://foo.com/instant?"
         "{google:omniboxStartMarginParameter}{google:forceInstantResults}"
         "foo=foo#foo=foo&strk";
     if (set_ntp_url) {
       data.new_tab_url = (insecure_ntp_url ? "http" : "https") +
           std::string("://foo.com/newtab?strk");
     }
     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);
   }
 
   // Build an Instant URL with or without a valid search terms replacement key
   // as per |has_search_term_replacement_key|. Set that URL as the instant URL
   // for the default search provider.
   void SetDefaultInstantTemplateUrl(bool has_search_term_replacement_key) {
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile());
 
     static const char kInstantURLWithStrk[] =
         "http://foo.com/instant?foo=foo#foo=foo&strk";
     static const char kInstantURLNoStrk[] =
         "http://foo.com/instant?foo=foo#foo=foo";
 
     TemplateURLData data;
     data.SetURL("http://foo.com/url?bar={searchTerms}");
     data.instant_url = (has_search_term_replacement_key ?
         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);
   }
 
   bool InInstantProcess(const content::WebContents* contents) {
     InstantService* instant_service =
         InstantServiceFactory::GetForProfile(profile());
     return instant_service->IsInstantProcess(
         contents->GetRenderProcessHost()->GetID());
@@ skipping 397 matching lines @@
 TEST_F(SearchTest, CommandLineOverrides) {
   GURL local_instant_url(GetLocalInstantURL(profile()));
   EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), local_instant_url);
 
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile());
   TemplateURLData data;
   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);
 
   // By default, Instant Extended forces the instant URL to be HTTPS, so even if
   // we set a Google base URL that is HTTP, we should get an HTTPS URL.
   UIThreadSearchTermsData::SetGoogleBaseURL("http://www.foo.com/");
   GURL instant_url(GetInstantURL(profile(), kDisableStartMargin, false));
   ASSERT_TRUE(instant_url.is_valid());
   EXPECT_EQ("https://www.foo.com/webhp?strk", instant_url.spec());
@@ skipping 253 matching lines @@
 class SearchURLTest : public SearchTest {
  protected:
   virtual void SetSearchProvider(bool set_ntp_url, bool insecure_ntp_url)
       OVERRIDE {
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile());
     TemplateURLData data;
     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_);
   }
 
   TemplateURL* template_url_;
 };
 
 TEST_F(SearchURLTest, QueryExtractionEnabled) {
   UIThreadSearchTermsData::SetGoogleBaseURL("http://www.google.com/");
@@ skipping 256 matching lines @@
 }
 
 TEST_F(OriginChipTest, CommandLineOnSrp) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableOriginChipOnSrp);
   EXPECT_TRUE(ShouldDisplayOriginChip());
   EXPECT_EQ(ORIGIN_CHIP_ON_SRP, GetOriginChipCondition());
 }
 
 }  // namespace chrome