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

chrome/browser/search_engines/template_url_service.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/search_engines/template_url_service.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util.h"
@@ skipping 171 matching lines @@
 
   // Remove leading "www.".
   result = net::StripWWW(result);
 
   // Remove trailing "/".
   return (result.length() > 0 && result[result.length() - 1] == '/') ?
       result.substr(0, result.length() - 1) : result;
 }
 
 // static
-GURL TemplateURLService::GenerateSearchURL(const TemplateURL* t_url) {
+GURL TemplateURLService::GenerateSearchURL(const TemplateURL* t_url,
+                                           Profile* profile) {

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

You don't actually need this, because none of the callers cares about anything
beyond the hostname.

The UIThreadSearchTermsData constructed here can be passed NULL, as can the
instances everywhere else.

   DCHECK(t_url);
-  UIThreadSearchTermsData search_terms_data;
+  UIThreadSearchTermsData search_terms_data(profile);
   return GenerateSearchURLUsingTermsData(t_url, search_terms_data);
 }
 
 // static
 GURL TemplateURLService::GenerateSearchURLUsingTermsData(
     const TemplateURL* t_url,
     const SearchTermsData& search_terms_data) {
   DCHECK(t_url);
   const TemplateURLRef* search_ref = t_url->url();
   // Extension keywords don't have host-based search URLs.
@@ skipping 502 matching lines @@
           !CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeFrame))
         GoogleURLTracker::RequestServerCheck();
     }
   }
 }
 
 void TemplateURLService::RemoveFromMaps(const TemplateURL* template_url) {
   if (!template_url->keyword().empty())
     keyword_to_template_map_.erase(template_url->keyword());
   if (loaded_)
-    provider_map_.Remove(template_url);
+    provider_map_.Remove(template_url, profile_);
 }
 
 void TemplateURLService::RemoveFromKeywordMapByPointer(
     const TemplateURL* template_url) {
   DCHECK(template_url);
   for (KeywordToTemplateMap::iterator i = keyword_to_template_map_.begin();
        i != keyword_to_template_map_.end(); ++i) {
     if (i->second == template_url) {
       keyword_to_template_map_.erase(i);
       // A given TemplateURL only occurs once in the map. As soon as we find the
       // entry, stop.
       break;
     }
   }
 }
 
 void TemplateURLService::AddToMaps(const TemplateURL* template_url) {
   if (!template_url->keyword().empty())
     keyword_to_template_map_[template_url->keyword()] = template_url;
   if (loaded_) {
-    UIThreadSearchTermsData search_terms_data;
+    UIThreadSearchTermsData search_terms_data(profile_);
     provider_map_.Add(template_url, search_terms_data);
   }
 }
 
 void TemplateURLService::SetTemplateURLs(
     const std::vector<TemplateURL*>& urls) {
   // Add mappings for the new items.
 
   // First, add the items that already have id's, so that the next_id_
   // gets properly set.
@@ skipping 13 matching lines @@
        ++i) {
     if ((*i)->id() != 0)
       continue;
     AddNoNotify(*i);
   }
 }
 
 void TemplateURLService::ChangeToLoadedState() {
   DCHECK(!loaded_);
 
-  UIThreadSearchTermsData search_terms_data;
+  UIThreadSearchTermsData search_terms_data(profile_);
   provider_map_.Init(template_urls_, search_terms_data);
   loaded_ = true;
 }
 
 void TemplateURLService::NotifyLoaded() {
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
       Source<TemplateURLService>(this),
       NotificationService::NoDetails());
 
@@ skipping 145 matching lines @@
                                         const TemplateURL& new_values) {
   DCHECK(loaded_);
   DCHECK(existing_turl);
   DCHECK(find(template_urls_.begin(), template_urls_.end(), existing_turl) !=
          template_urls_.end());
 
   if (!existing_turl->keyword().empty())
     keyword_to_template_map_.erase(existing_turl->keyword());
 
   // This call handles copying over the values (while retaining the id).
-  UIThreadSearchTermsData search_terms_data;
-  provider_map_.Update(existing_turl, new_values, search_terms_data);
+  UIThreadSearchTermsData search_terms_data(profile_);
+  provider_map_.Update(existing_turl, new_values, search_terms_data, profile_);
 
   if (!existing_turl->keyword().empty())
     keyword_to_template_map_[existing_turl->keyword()] = existing_turl;
 
   if (service_.get())
     service_->UpdateKeyword(*existing_turl);
 
   if (default_search_provider_ == existing_turl)
     SetDefaultSearchProviderNoNotify(existing_turl);
 }
@@ skipping 131 matching lines @@
          t_url->suggestions_url()->HasGoogleBaseURLs())) {
       RemoveFromKeywordMapByPointer(t_url);
       t_url->InvalidateCachedValues();
       if (!t_url->keyword().empty())
         keyword_to_template_map_[t_url->keyword()] = t_url;
       something_changed = true;
     }
   }
 
   if (something_changed && loaded_) {
-    UIThreadSearchTermsData search_terms_data;
+    UIThreadSearchTermsData search_terms_data(profile_);
     provider_map_.UpdateGoogleBaseURLs(search_terms_data);
     NotifyObservers();
   }
 }
 
 void TemplateURLService::UpdateDefaultSearch() {
   if (!loaded_) {
     // Set |initial_default_search_provider_| from the preferences.  We use this
     // value for default search provider until the database has been loaded.
     if (!LoadDefaultSearchProviderFromPrefs(&initial_default_search_provider_,
@@ skipping 221 matching lines @@
 
       i = template_urls->erase(i);
       if (service_.get())
         service_->RemoveKeyword(*template_url);
       delete template_url;
     } else {
       ++i;
     }
   }
 }