Add a Profile* member to TemplateURL. This makes some invocations of ReplaceSearchTerms() a bit le…

chrome/browser/search_engines/template_url.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/time.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "googleurl/src/gurl.h"
 
 class Profile;
 class SearchTermsData;
 class TemplateURL;
 
 
 // TemplateURLRef -------------------------------------------------------------
 
 // A TemplateURLRef represents a single URL within the larger TemplateURL class
 // (which represents an entire "search engine", see below).  If
 // SupportsReplacement() is true, this URL has placeholders in it, for which
 // callers can substitute values to get a "real" URL using ReplaceSearchTerms().
 //
 // TemplateURLRefs always have a non-NULL |owner_| TemplateURL, which they
-// access in order to get at important data like the underlying URL string.
+// access in order to get at important data like the underlying URL string or
+// the associated Profile.
 class TemplateURLRef {
  public:
   // Magic numbers to pass to ReplaceSearchTerms() for the |accepted_suggestion|
   // parameter.  Most callers aren't using Suggest capabilities and should just
   // pass NO_SUGGESTIONS_AVAILABLE.
   // NOTE: Because positive values are meaningful, make sure these are negative!
   enum AcceptedSuggestion {
     NO_SUGGESTION_CHOSEN = -1,
     NO_SUGGESTIONS_AVAILABLE = -2,
   };
@@ skipping 22 matching lines @@
   // Returns a string that is the result of replacing the search terms in
   // the url with the specified value.  We use our owner's input encoding.
   //
   // If this TemplateURLRef does not support replacement (SupportsReplacement
   // returns false), an empty string is returned.
   std::string ReplaceSearchTerms(
       const string16& terms,
       int accepted_suggestion,
       const string16& original_query_for_suggestion) const;
 
-  // Just like ReplaceSearchTerms except that it takes a Profile that's used to
-  // retrieve Instant field trial params. Most callers don't care about those
-  // params, and so can use ReplaceSearchTerms instead.
-  std::string ReplaceSearchTermsUsingProfile(
-      Profile* profile,
-      const string16& terms,
-      int accepted_suggestion,
-      const string16& original_query_for_suggestion) const;
-
   // Just like ReplaceSearchTerms except that it takes SearchTermsData to supply
   // the data for some search terms. Most of the time ReplaceSearchTerms should
   // be called.
   std::string ReplaceSearchTermsUsingTermsData(
       const string16& terms,
       int accepted_suggestion,
       const string16& original_query_for_suggestion,
       const SearchTermsData& search_terms_data) const;
 
   // Returns true if the TemplateURLRef is valid. An invalid TemplateURLRef is
@@ skipping 265 matching lines @@
 // One TemplateURL contains several TemplateURLRefs, which correspond to various
 // 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*.
 // The TemplateURLService, which handles storing and manipulating TemplateURLs,
 // is made a friend so that it can be the exception to this pattern.
 class TemplateURL {
  public:
-  explicit TemplateURL(const TemplateURLData& data);
+  // |profile| may be NULL.  This will affect the results of e.g. calling
+  // ReplaceSearchTerms() on the member TemplateURLRefs.
+  TemplateURL(Profile* profile, const TemplateURLData& data);
 
   TemplateURL(const TemplateURL& other);
   TemplateURL& operator=(const TemplateURL& other);
 
   ~TemplateURL();
 
   // Generates a favicon URL from the specified url.
   static GURL GenerateFaviconURL(const GURL& url);
 
+  Profile* profile() { return profile_; }
   const TemplateURLData& data() const { return data_; }
 
   const string16& short_name() const { return data_.short_name; }
   // An accessor for the short_name, but adjusted so it can be appropriately
   // displayed even if it is LTR and the UI is RTL.
   string16 AdjustedShortNameForLocaleDirection() const;
 
   const string16& keyword() const { return data_.keyword(this); }
   bool autogenerate_keyword() const {
     return data_.autogenerate_keyword();
@@ skipping 49 matching lines @@
 
  private:
   friend class TemplateURLService;
 
   void SetURL(const std::string& url);
   void SetPrepopulateId(int id);
 
   // Invalidates cached values on this object and its child TemplateURLRefs.
   void InvalidateCachedValues();
 
+  Profile* profile_;
   TemplateURLData data_;
   TemplateURLRef url_ref_;
   TemplateURLRef suggestions_url_ref_;
   TemplateURLRef instant_url_ref_;
 
   // TODO(sky): Add date last parsed OSD file.
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_