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

chrome/browser/ui/search_engines/edit_search_engine_controller.cc

 // 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.
 
 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 35 matching lines @@
     if (template_url_ ==
         TemplateURLServiceFactory::GetForProfile(profile_)->
         GetDefaultSearchProvider())
       return false;
     return GURL(url).is_valid();
   }
 
   // If the url has a search term, replace it with a random string and make
   // sure the resulting URL is valid. We don't check the validity of the url
   // with the search term as that is not necessarily valid.
-  return GURL(template_ref.ReplaceSearchTerms(TemplateURL(), ASCIIToUTF16("a"),
+  return GURL(template_ref.ReplaceSearchTerms(profile_,

[Peter Kasting, 2011/08/10 20:54:06]

You can pass NULL here, it won't matter to the validity check.

+      TemplateURL(), ASCIIToUTF16("a"),
       TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())).is_valid();
 }
 
 bool EditSearchEngineController::IsKeywordValid(
     const string16& keyword_input) const {
   string16 keyword_input_trimmed(CollapseWhitespace(keyword_input, true));
   if (keyword_input_trimmed.empty())
     return false;  // Do not allow empty keyword.
   const TemplateURL* turl_with_keyword =
       TemplateURLServiceFactory::GetForProfile(profile_)->
@@ skipping 63 matching lines @@
                  TRIM_ALL, &url);
   if (url.empty())
     return url;
 
   // Parse the string as a URL to determine the scheme. If we need to, add the
   // scheme. As the scheme may be expanded (as happens with {google:baseURL})
   // we need to replace the search terms before testing for the scheme.
   TemplateURL t_url;
   t_url.SetURL(url, 0, 0);
   std::string expanded_url =
-      t_url.url()->ReplaceSearchTerms(t_url, ASCIIToUTF16("x"), 0, string16());
+      t_url.url()->ReplaceSearchTerms(profile_, t_url, ASCIIToUTF16("x"), 0,

[Peter Kasting, 2011/08/10 20:54:06]

You can pass NULL here as you don't read the query off this URL.

+                                      string16());
   url_parse::Parsed parts;
   std::string scheme(
       URLFixerUpper::SegmentURL(expanded_url, &parts));
   if (!parts.scheme.is_valid()) {
     scheme.append("://");
     url.insert(0, scheme);
   }
 
   return url;
 }
-