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

chrome/browser/search_engines/template_url_service_unittest.cc

Index: chrome/browser/search_engines/template_url_service_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc
index 7661ec1a3f8648997df41c818d6741328c355852..a16112f62dffb4b0f6f54c55db7e02b9b857b88c 100644
--- a/chrome/browser/search_engines/template_url_service_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_unittest.cc
@@ -37,8 +37,9 @@ using ::testing::StrictMock;
 class TestGenerateSearchURL
     : public base::RefCountedThreadSafe<TestGenerateSearchURL> {
  public:
-  explicit TestGenerateSearchURL(SearchTermsData* search_terms_data)
-      : search_terms_data_(search_terms_data),
+  TestGenerateSearchURL(Profile* profile, SearchTermsData* search_terms_data)
+      : profile_(profile),
+        search_terms_data_(search_terms_data),
         passed_(false) {
   }
 
@@ -52,6 +53,7 @@ class TestGenerateSearchURL
   friend class base::RefCountedThreadSafe<TestGenerateSearchURL>;
   ~TestGenerateSearchURL() {}
 
+  Profile* const profile_;
   SearchTermsData* search_terms_data_;
   bool passed_;
 
@@ -313,7 +315,7 @@ void TestGenerateSearchURL::RunTest() {
     std::string result = search_terms_data_ ?
         TemplateURLService::GenerateSearchURLUsingTermsData(
             &t_url, *search_terms_data_).spec() :
-        TemplateURLService::GenerateSearchURL(&t_url).spec();
+        TemplateURLService::GenerateSearchURL(&t_url, profile_).spec();
     if (strcmp(generate_url_cases[i].expected, result.c_str())) {
       LOG(ERROR) << generate_url_cases[i].test_name << " failed. Expected " <<
           generate_url_cases[i].expected << " Actual " << result;
@@ -483,7 +485,7 @@ TEST_F(TemplateURLServiceTest, GenerateKeyword) {
 
 TEST_F(TemplateURLServiceTest, GenerateSearchURL) {
   scoped_refptr<TestGenerateSearchURL> test_generate_search_url(
-      new TestGenerateSearchURL(NULL));
+      new TestGenerateSearchURL(profile(), NULL));
   test_generate_search_url->RunTest();
   EXPECT_TRUE(test_generate_search_url->passed());
 }
@@ -493,7 +495,7 @@ TEST_F(TemplateURLServiceTest, GenerateSearchURLUsingTermsData) {
   // wait for it to finish.
   TestSearchTermsData search_terms_data("http://google.com/");
   scoped_refptr<TestGenerateSearchURL> test_generate_search_url(
-      new TestGenerateSearchURL(&search_terms_data));
+      new TestGenerateSearchURL(profile(), &search_terms_data));
 
   test_util_.StartIOThread();
   BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)->PostTask(
@@ -891,8 +893,9 @@ TEST_F(TemplateURLServiceTest, ChangeGoogleBaseValue) {
   EXPECT_TRUE(model()->GetTemplateURLForHost("google.com") == NULL);
   EXPECT_EQ("foo.com", t_url->url()->GetHost());
   EXPECT_EQ(ASCIIToUTF16("foo.com"), t_url->keyword());
-  EXPECT_EQ("http://foo.com/?q=x", t_url->url()->ReplaceSearchTerms(*t_url,
-      ASCIIToUTF16("x"), TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
+  EXPECT_EQ("http://foo.com/?q=x", t_url->url()->ReplaceSearchTerms(profile(),

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

This call and the one below can pass NULL since you don't care about the field
trial in tests.

+      *t_url, ASCIIToUTF16("x"), TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
+      string16()));
 }
 
 struct QueryHistoryCallbackImpl {
@@ -929,8 +932,8 @@ TEST_F(TemplateURLServiceTest, GenerateVisitOnKeyword) {
   HistoryService* history =
       profile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
   history->AddPage(
-      GURL(t_url->url()->ReplaceSearchTerms(*t_url, ASCIIToUTF16("blah"), 0,
-                                            string16())),
+      GURL(t_url->url()->ReplaceSearchTerms(profile(), *t_url,
+          ASCIIToUTF16("blah"), 0, string16())),
       NULL, 0, GURL(), PageTransition::KEYWORD, history::RedirectList(),
       history::SOURCE_BROWSED, false);