Add a URL param to indicate group selection in Instant field trial.

chrome/browser/search_engines/template_url.h

 // Copyright (c) 2011 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/search_engine_type.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "googleurl/src/gurl.h"
 
 class PrefService;
+class Profile;
 class SearchTermsData;
 class TemplateURL;
 class WebDataService;
 struct WDKeywordsResult;
 
 // TemplateURL represents the relevant portions of the Open Search Description
 // Document (http://www.opensearch.org/Specifications/OpenSearch).
 // The main use case for TemplateURL is to use the TemplateURLRef returned by
 // suggestions_url or url for keyword/suggestion expansion:
 // . suggestions_url describes a URL that is ideal for as you type suggestions.
@@ skipping 35 matching lines @@
       const SearchTermsData& search_terms_data) const;
 
   // Returns a string that is the result of replacing the search terms in
   // the url with the specified value.
   //
   // If this TemplateURLRef does not support replacement (SupportsReplacement
   // returns false), an empty string is returned.
   //
   // The TemplateURL is used to determine the input encoding for the term.
   std::string ReplaceSearchTerms(
+      Profile* profile,
       const TemplateURL& host,
       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(
+      Profile* profile,

[sky, 2011/08/08 23:37:23]

This too may be invoked from any thread, which implies it should not take a
Profile.

[sreeram, 2011/08/09 16:24:01]

I am not sure how to interpret this.

Is the concern that if this takes a Profile* (which implies that it could modify
Profile), then multiple threads could call it without locking, with a potential
for data corruption? This could be fixed by guarding uses of the Profile* with a
lock (in instant_field_trial.cc), or even better, just making this a "const
Profile*" (I'll need to make some upstream changes to make
Profile::IsOffTheRecord() and Profile::GetPrefs() const, which they technically
are, but just aren't marked so).

Or, is the concern that the Profile could change from underneath a thread while
another thread is using it? This would seem to cause a lot more headaches in the
rest of Chrome (i.e., not just in this code), so I don't think this is the
concern, right?

If you are saying that this absolutely should not take a Profile at all, then
could you propose an alternative of how to achieve my goal (of passing the
necessary Profile information to the Instant field trial code)?

       const TemplateURL& host,
       const string16& terms,
       int accepted_suggestion,
       const string16& original_query_for_suggestion,
       const SearchTermsData& search_terms_data) const;
 
   // Returns the raw URL. None of the parameters will have been replaced.
   const std::string& url() const { return url_; }
 
   // Returns the index number of the first search result.
@@ skipping 62 matching lines @@
   // Enumeration of the known types.
   enum ReplacementType {
     ENCODING,
     GOOGLE_ACCEPTED_SUGGESTION,
     GOOGLE_BASE_URL,
     GOOGLE_BASE_SUGGEST_URL,
     GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION,
     GOOGLE_RLZ,
     GOOGLE_SEARCH_FIELDTRIAL_GROUP,
     GOOGLE_UNESCAPED_SEARCH_TERMS,
+    INSTANT_FIELD_TRIAL_GROUP,
     LANGUAGE,
     SEARCH_TERMS,
   };
 
   // Used to identify an element of the raw url that can be replaced.
   struct Replacement {
     Replacement(ReplacementType type, size_t index)
         : type(type), index(index) {}
     ReplacementType type;
     size_t index;
@@ skipping 364 matching lines @@
   int logo_id_;
   int prepopulate_id_;
   // The primary unique identifier for Sync. This is only set on TemplateURLs
   // that have been associated with Sync.
   std::string sync_guid_;
 
   // TODO(sky): Add date last parsed OSD file.
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_