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

chrome/browser/search_engines/template_url_prepopulate_data_unittest.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 "base/file_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
@@ skipping 114 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("fook"), t_urls[0]->keyword());
   EXPECT_EQ("foo.com", t_urls[0]->url()->GetHost());
   EXPECT_EQ("foi.com", t_urls[0]->GetFaviconURL().host());
   EXPECT_EQ(1u, t_urls[0]->input_encodings().size());
   EXPECT_EQ(1001, t_urls[0]->prepopulate_id());
   EXPECT_EQ(SEARCH_ENGINE_GOOGLE, t_urls[0]->search_engine_type());
   EXPECT_EQ(0, t_urls[0]->logo_id());
 }
 
 TEST_F(TemplateURLPrepopulateDataTest, SearchEngineFromOrigin) {
-  UIThreadSearchTermsData search_terms_data;
   std::set<GURL> unique_engines;
 
   { // Scoping for the profile.
     TestingProfile profile;
+    UIThreadSearchTermsData search_terms_data(&profile);

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

You can pass NULL here and below.

     for (size_t i = 0; i < arraysize(kCountryIds); ++i) {
       profile.GetPrefs()->SetInteger(prefs::kCountryIDAtInstall,
                                      kCountryIds[i]);
       ScopedVector<TemplateURL> urls;
       size_t default_index;
       TemplateURLPrepopulateData::GetPrepopulatedEngines(
           profile.GetPrefs(), &(urls.get()), &default_index);
       for (size_t turl_i = 0; turl_i < urls.size(); ++turl_i) {
         GURL engine_url(urls[turl_i]->url()->url());
         if (!engine_url.is_valid()) {
           engine_url = TemplateURLService::GenerateSearchURLUsingTermsData(
               urls[turl_i], search_terms_data);
         }
         GURL origin = engine_url.GetOrigin();
         unique_engines.insert(origin);
       }
     }
   }
 
   TestingProfile profile;
+  UIThreadSearchTermsData search_terms_data(&profile);
   for (std::set<GURL>::iterator it = unique_engines.begin();
        it != unique_engines.end(); ++it) {
     scoped_ptr<TemplateURL> found_url(
-        TemplateURLPrepopulateData::GetEngineForOrigin(profile.GetPrefs(),
-                                                       *it));
+        TemplateURLPrepopulateData::GetEngineForOrigin(&profile, *it));
     EXPECT_EQ(
         TemplateURLService::GenerateSearchURLUsingTermsData(
             found_url.get(), search_terms_data).GetOrigin(),
         it->GetOrigin());
   }
 
   GURL not_a_search_engine("http://example.com/");
-  EXPECT_EQ(NULL, TemplateURLPrepopulateData::GetEngineForOrigin(
-      profile.GetPrefs(),
+  EXPECT_EQ(NULL, TemplateURLPrepopulateData::GetEngineForOrigin(&profile,
       not_a_search_engine));
 }
 
 TEST_F(TemplateURLPrepopulateDataTest, GetSearchEngineLogo) {
   GURL bad_engine("http://example.com/");
   EXPECT_EQ(kNoSearchEngineLogo,
             TemplateURLPrepopulateData::GetSearchEngineLogo(bad_engine));
   GURL engine_with_logo("http://www.ask.com/");
   EXPECT_EQ(IDR_SEARCH_ENGINE_LOGO_ASK,
             TemplateURLPrepopulateData::GetSearchEngineLogo(engine_with_logo));
   GURL engine_no_logo("http://araby.com/");
   EXPECT_EQ(kNoSearchEngineLogo,
             TemplateURLPrepopulateData::GetSearchEngineLogo(engine_no_logo));
 
 }