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

chrome/browser/search_engines/template_url_service.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_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 73 matching lines @@
   // not want to auto-add keywords, such as keywords for searches on pages that
   // themselves come from form submissions.
   static string16 GenerateKeyword(const GURL& url, bool autodetected);
 
   // Removes any unnecessary characters from a user input keyword.
   // This removes the leading scheme, "www." and any trailing slash.
   static string16 CleanUserInputKeyword(const string16& keyword);
 
   // Returns the search url for t_url.  Returns an empty GURL if t_url has no
   // url().
-  static GURL GenerateSearchURL(const TemplateURL* t_url);
+  static GURL GenerateSearchURL(Profile* profile, const TemplateURL* t_url);
 
   // Just like GenerateSearchURL except that it takes SearchTermsData to supply
   // the data for some search terms. Most of the time GenerateSearchURL should
   // be called.
   static GURL GenerateSearchURLUsingTermsData(
+      Profile* profile,

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

This method shouldn't take a profile, it's intended to be invoked from any
thread. If you say you'll just supply NULL, that doesn't sit well with me as
it's all to easy to get it wrong and the signature implies you should pass in a
Profile.

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

I only supply NULL where the caller strips away the params immediately (and
where passing a real Profile* would require jumping through a lot more hoops).
For example, see the calls in search_host_to_urls_map.cc.

In places where a Profile is readily available, I do supply it. For example, see
the calls in template_url_prepopulate_data_unittest.cc. It turns out that all
such cases are in test code, where the tests would pass just fine even if I
passed NULL.

So, if you prefer, I can remove the Profile* parameter from the
GenerateSearchURL*() methods, which would mean that I would then pass NULL
instead on line 214 in template_url_service.cc, i.e., where
GenerateSearchURLUsingTermsData() calls ReplaceSearchTermsUsingTermsData().
Would you prefer that?

       const TemplateURL* t_url,
       const SearchTermsData& search_terms_data);
 
   // Returns true if there is no TemplateURL that conflicts with the
   // keyword/url pair, or there is one but it can be replaced. If there is an
   // existing keyword that can be replaced and template_url_to_replace is
   // non-NULL, template_url_to_replace is set to the keyword to replace.
   //
   // url gives the url of the search query. The url is used to avoid generating
   // a TemplateURL for an existing TemplateURL that shares the same host.
@@ skipping 344 matching lines @@
   // List of extension IDs waiting for Load to have keywords registered.
   std::vector<std::string> pending_extension_ids_;
 
   // Function returning current time in base::Time units.
   TimeProvider* time_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_