Remove Profile* from TemplateURL

chrome/browser/search_engines/template_url.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search_engines/template_url.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 1110 matching lines @@
 
   if (!post_params_.empty())
     EncodeFormData(post_params_, post_content);
 
   return url;
 }
 
 
 // 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),
       instant_url_ref_(this,
                        TemplateURLRef::INSTANT),
       image_url_ref_(this, TemplateURLRef::IMAGE),
       new_tab_url_ref_(this, TemplateURLRef::NEW_TAB),
       contextual_search_url_ref_(this, TemplateURLRef::CONTEXTUAL_SEARCH) {
   SetPrepopulateId(data_.prepopulate_id);
 
@@ skipping 82 matching lines @@
       url_ref_.HasGoogleBaseURLs(search_terms_data) &&
       google_util::IsGoogleHostname(base::UTF16ToUTF8(data_.keyword()),
                                     google_util::DISALLOW_SUBDOMAIN);
 }
 
 bool TemplateURL::HasSameKeywordAs(
     const TemplateURLData& other,
     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));
 }
 
 TemplateURL::Type TemplateURL::GetType() const {
   if (extension_info_)
     return NORMAL_CONTROLLED_BY_EXTENSION;
   return GURL(data_.url()).SchemeIs(extensions::kExtensionScheme) ?
       OMNIBOX_API_EXTENSION : NORMAL;
 }
 
@@ skipping 105 matching lines @@
       return;
     }
   }
   NOTREACHED();
 }
 
 void TemplateURL::CopyFrom(const TemplateURL& other) {
   if (this == &other)
     return;
 
-  profile_ = other.profile_;
   data_ = other.data_;
   url_ref_.InvalidateCachedValues();
   suggestions_url_ref_.InvalidateCachedValues();
   instant_url_ref_.InvalidateCachedValues();
   SetPrepopulateId(other.data_.prepopulate_id);
 }
 
 void TemplateURL::SetURL(const std::string& url) {
   data_.SetURL(url);
   url_ref_.InvalidateCachedValues();
 }
 
 void TemplateURL::SetPrepopulateId(int id) {
   data_.prepopulate_id = id;
   const bool prepopulated = id > 0;
   url_ref_.prepopulated_ = prepopulated;
   suggestions_url_ref_.prepopulated_ = prepopulated;
   instant_url_ref_.prepopulated_ = prepopulated;
 }
 
 void TemplateURL::ResetKeywordIfNecessary(
     const SearchTermsData& search_terms_data,
     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));
   }
 }
 
 bool TemplateURL::FindSearchTermsInURL(
     const GURL& url,
     const SearchTermsData& search_terms_data,
     base::string16* search_terms,
     url::Parsed::ComponentType* search_term_component,
@@ skipping 12 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }