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

chrome/browser/ui/views/default_search_view.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/views/default_search_view.h"
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 12 matching lines @@
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 #include "views/window/dialog_client_view.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 // Returns a short name and logo resource id for the given host.
-void GetShortNameAndLogoId(PrefService* prefs,
+void GetShortNameAndLogoId(Profile* profile,

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

All the changes in this file can end up being reverted.

                            const TemplateURL* turl,
                            std::wstring* short_name,
                            int* logo_id) {
-  DCHECK(prefs);
+  DCHECK(profile);
   DCHECK(turl);
   DCHECK(short_name);
   DCHECK(logo_id);
 
-  GURL url = TemplateURLService::GenerateSearchURL(turl);
+  GURL url = TemplateURLService::GenerateSearchURL(turl, profile);
   scoped_ptr<TemplateURL> built_in_data(
-      TemplateURLPrepopulateData::GetEngineForOrigin(prefs, url));
+      TemplateURLPrepopulateData::GetEngineForOrigin(profile, url));
 
   // Use the built-in information to generate the short name (to ensure
   // that we don't use a name given by the search engine to itself which
   // in the worst case could be misleading).
   if (built_in_data.get()) {
     *short_name = built_in_data->short_name();
     *logo_id = built_in_data->logo_id();
   } else {
     *short_name = UTF8ToWide(url.host()).c_str();
     *logo_id = kNoSearchEngineLogo;
@@ skipping 127 matching lines @@
 DefaultSearchView::DefaultSearchView(TabContents* tab_contents,
                                      TemplateURL* proposed_default_turl,
                                      TemplateURLService* template_url_service)
     : background_image_(NULL),
       default_provider_button_(NULL),
       proposed_provider_button_(NULL),
       proposed_turl_(proposed_default_turl),
       template_url_service_(template_url_service) {
   Profile* profile =
       Profile::FromBrowserContext(tab_contents->browser_context());
-  PrefService* prefs = profile->GetPrefs();
-  SetupControls(prefs);
+  SetupControls(profile);
 
   // Show the dialog.
   tab_contents->CreateConstrainedDialog(this);
 }
 
-void DefaultSearchView::SetupControls(PrefService* prefs) {
+void DefaultSearchView::SetupControls(Profile* profile) {
   using views::ColumnSet;
   using views::GridLayout;
   using views::ImageView;
   using views::Label;
 
   // Column set id's.
   const int kWholeDialogViewSetId = 0;
   const int kPaddedWholeDialogViewSetId = 1;
   const int kChoicesViewSetId = 2;
 
   // Set up the information for the proposed default.
   std::wstring proposed_short_name;
   int proposed_logo_id = kNoSearchEngineLogo;
-  GetShortNameAndLogoId(prefs,
+  GetShortNameAndLogoId(profile,
                         proposed_turl_.get(),
                         &proposed_short_name,
                         &proposed_logo_id);
   if (proposed_logo_id != kNoSearchEngineLogo)
     proposed_turl_->set_logo_id(proposed_logo_id);
 
 
   // Set up the information for the current default.
   std::wstring default_short_name;
   int default_logo_id = kNoSearchEngineLogo;
-  GetShortNameAndLogoId(prefs,
+  GetShortNameAndLogoId(profile,
                         template_url_service_->GetDefaultSearchProvider(),
                         &default_short_name,
                         &default_logo_id);
 
   // Now set-up the dialog contents.
   GridLayout* layout = new views::GridLayout(this);
   layout->SetInsets(0, 0, views::kPanelVertMargin, 0);
   SetLayoutManager(layout);
 
   // Add a column set that spans the whole dialog.
@@ skipping 68 matching lines @@
       this,
       IDS_DEFAULT_SEARCH_PROMPT_CURRENT,
       default_short_name);
   layout->AddView(default_provider_button_);
   proposed_provider_button_ = CreateProviderChoiceButton(
       this,
       IDS_DEFAULT_SEARCH_PROMPT_PROPOSED,
       proposed_short_name);
   layout->AddView(proposed_provider_button_);
 }