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

chrome/browser/search_engines/search_provider_install_data.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/search_provider_install_data.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 86 matching lines @@
     install_data_->OnGoogleURLChange(google_base_url);
 }
 
 // Notices changes in the Google base URL and sends them along
 // to the SearchProviderInstallData on the I/O thread.
 class GoogleURLObserver : public NotificationObserver {
  public:
   GoogleURLObserver(
       GoogleURLChangeNotifier* change_notifier,
       int ui_death_notification,
-      const NotificationSource& ui_death_source);
+      const NotificationSource& ui_death_source,
+      Profile* profile);
 
   // Implementation of NotificationObserver.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  private:
   virtual ~GoogleURLObserver() {}
 
   scoped_refptr<GoogleURLChangeNotifier> change_notifier_;
   NotificationRegistrar registrar_;
+  Profile* const profile_;
 
   DISALLOW_COPY_AND_ASSIGN(GoogleURLObserver);
 };
 
 GoogleURLObserver::GoogleURLObserver(
       GoogleURLChangeNotifier* change_notifier,
       int ui_death_notification,
-      const NotificationSource& ui_death_source)
-    : change_notifier_(change_notifier) {
+      const NotificationSource& ui_death_source,
+      Profile* profile)
+    : change_notifier_(change_notifier),
+      profile_(profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
                  NotificationService::AllSources());
   registrar_.Add(this, ui_death_notification, ui_death_source);
 }
 
 void GoogleURLObserver::Observe(int type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_GOOGLE_URL_UPDATED) {
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
         NewRunnableMethod(change_notifier_.get(),
-                          &GoogleURLChangeNotifier::OnChange,
-                          UIThreadSearchTermsData().GoogleBaseURLValue()));
+            &GoogleURLChangeNotifier::OnChange,
+            UIThreadSearchTermsData(profile_).GoogleBaseURLValue()));

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

Neither caller in this file is asking for the instant trial string, so you can
pass NULL in both these functions and not add Profile*s to all the declarations.

   } else {
     // This must be the death notification.
     delete this;
   }
 }
 
 // Indicates if the two inputs have the same security origin.
 // |requested_origin| should only be a security origin (no path, etc.).
 // It is ok if |template_url| is NULL.
 static bool IsSameOrigin(const GURL& requested_origin,
                          const TemplateURL* template_url,
                          const SearchTermsData& search_terms_data) {
   DCHECK(requested_origin == requested_origin.GetOrigin());
   return template_url && requested_origin ==
       TemplateURLService::GenerateSearchURLUsingTermsData(
           template_url,
           search_terms_data).GetOrigin();
 }
 
 }  // namespace
 
 SearchProviderInstallData::SearchProviderInstallData(
     WebDataService* web_service,
     int ui_death_notification,
-    const NotificationSource& ui_death_source)
+    const NotificationSource& ui_death_source,
+    Profile* profile)
     : web_service_(web_service),
       load_handle_(0),
-      google_base_url_(UIThreadSearchTermsData().GoogleBaseURLValue()) {
+      google_base_url_(UIThreadSearchTermsData(profile).GoogleBaseURLValue()) {
   // GoogleURLObserver is responsible for killing itself when
   // the given notification occurs.
   new GoogleURLObserver(new GoogleURLChangeNotifier(AsWeakPtr()),
-                        ui_death_notification, ui_death_source);
+                        ui_death_notification, ui_death_source, profile);
   DetachFromThread();
 }
 
 SearchProviderInstallData::~SearchProviderInstallData() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (load_handle_) {
     DCHECK(web_service_.get());
     web_service_->CancelRequest(load_handle_);
   }
@@ skipping 114 matching lines @@
 void SearchProviderInstallData::NotifyLoaded() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   task_queue_.Run();
 
   // Since we expect this request to be rare, clear out the information. This
   // also keeps the responses current as the search providers change.
   provider_map_.reset();
   SetDefault(NULL);
 }