Don't send omnibox bounds for hidden field trials.

chrome/browser/instant/instant_controller.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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
@@ skipping 27 matching lines @@
 InstantController::InstantController(Profile* profile,
                                      InstantDelegate* delegate)
     : delegate_(delegate),
       tab_contents_(NULL),
       is_displayable_(false),
       is_out_of_date_(true),
       commit_on_mouse_up_(false),
       last_transition_type_(content::PAGE_TRANSITION_LINK),
       ALLOW_THIS_IN_INITIALIZER_LIST(destroy_factory_(this)) {
   PrefService* service = profile->GetPrefs();
-  if (service && !InstantFieldTrial::IsExperimentGroup(profile)) {
+  if (service && !InstantFieldTrial::IsInstantExperiment(profile)) {
     // kInstantEnabledOnce was added after instant, set it now to make sure it
     // is correctly set.
     service->SetBoolean(prefs::kInstantEnabledOnce, true);
   }
 }
 
 InstantController::~InstantController() {
 }
 
 // static
@@ skipping 31 matching lines @@
       UMA_HISTOGRAM_CUSTOM_COUNTS("Instant.EnabledTime.Predictive",
                                   delta.InHours(), 1, 30 * 24, 50);
     }
   }
 }
 
 // static
 bool InstantController::IsEnabled(Profile* profile) {
   PrefService* prefs = profile->GetPrefs();
   return prefs->GetBoolean(prefs::kInstantEnabled) ||
-         InstantFieldTrial::IsExperimentGroup(profile);
+         InstantFieldTrial::IsInstantExperiment(profile);
 }
 
 // static
 void InstantController::Enable(Profile* profile) {
   PromoCounter* promo_counter = profile->GetInstantPromoCounter();
   if (promo_counter)
     promo_counter->Hide();
 
   PrefService* service = profile->GetPrefs();
   if (!service)
@@ skipping 82 matching lines @@
   return true;
 }
 
 void InstantController::SetOmniboxBounds(const gfx::Rect& bounds) {
   if (omnibox_bounds_ == bounds)
     return;
 
   // Always track the omnibox bounds. That way if Update is later invoked the
   // bounds are in sync.
   omnibox_bounds_ = bounds;
-  if (loader_.get())
+
+  if (loader_.get() && !is_out_of_date_ &&
+      !InstantFieldTrial::IsHiddenExperiment(tab_contents_->profile())) {
     loader_->SetOmniboxBounds(bounds);
+  }
 }
 
 void InstantController::DestroyPreviewContents() {
   if (!loader_.get()) {
     // We're not showing anything, nothing to do.
     return;
   }
 
   delegate_->HideInstant();
   delete ReleasePreviewContents(INSTANT_COMMIT_DESTROY);
@@ skipping 16 matching lines @@
 }
 
 bool InstantController::PrepareForCommit() {
   // Basic checks to prevent accessing a dangling |tab_contents_| pointer.
   // http://crbug.com/100521.
   if (is_out_of_date_ || !loader_.get())
     return false;
 
   // If we are not in the HIDDEN or SILENT field trials, return the status of
   // the preview.
-  if (!InstantFieldTrial::IsHiddenExperiment(tab_contents_->profile()) &&
-      !InstantFieldTrial::IsSilentExperiment(tab_contents_->profile())) {
+  if (!InstantFieldTrial::IsHiddenExperiment(tab_contents_->profile()))
     return IsCurrent();
-  }
 
   TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(
       tab_contents_->profile());
   if (!model)
     return false;
 
   const TemplateURL* template_url = model->GetDefaultSearchProvider();
   if (!IsValidInstantTemplateURL(template_url) ||
       loader_->template_url_id() != template_url->id() ||
       loader_->IsNavigationPending() ||
@@ skipping 108 matching lines @@
   }
 
   DestroyPreviewContents();
 }
 #endif
 
 void InstantController::OnAutocompleteGotFocus(
     TabContentsWrapper* tab_contents) {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (!cl->HasSwitch(switches::kPreloadInstantSearch) &&
-      !InstantFieldTrial::IsExperimentGroup(tab_contents->profile())) {
+      !InstantFieldTrial::IsInstantExperiment(tab_contents->profile())) {
     return;
   }
 
   TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(
       tab_contents->profile());
   if (!model)
     return;
 
   const TemplateURL* template_url = model->GetDefaultSearchProvider();
   if (!IsValidInstantTemplateURL(template_url))
@@ skipping 105 matching lines @@
   }
 }
 
 void InstantController::UpdateLoader(const TemplateURL* template_url,
                                      const GURL& url,
                                      content::PageTransition transition_type,
                                      const string16& user_text,
                                      bool verbatim,
                                      string16* suggested_text) {
   is_out_of_date_ = false;
-  loader_->SetOmniboxBounds(omnibox_bounds_);
+  bool hidden = InstantFieldTrial::IsHiddenExperiment(tab_contents_->profile());
+  if (!hidden)
+    loader_->SetOmniboxBounds(omnibox_bounds_);
   loader_->Update(tab_contents_, template_url, url, transition_type, user_text,
                   verbatim, suggested_text);
   UpdateIsDisplayable();
-  // For the HIDDEN field trial, don't send back suggestions to the omnibox.
-  if (InstantFieldTrial::IsHiddenExperiment(tab_contents_->profile()))
+  // For the HIDDEN and SILENT field trials, don't send back suggestions.
+  if (hidden)
     suggested_text->clear();
 }
 
 bool InstantController::ShouldUseInstant(const AutocompleteMatch& match) {
   TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(
       tab_contents_->profile());
   if (!model)
     return false;
 
   const TemplateURL* default_t_url = model->GetDefaultSearchProvider();
@@ skipping 36 matching lines @@
   if (destroy_factory_.empty()) {
     MessageLoop::current()->PostTask(
         FROM_HERE, destroy_factory_.NewRunnableMethod(
             &InstantController::DestroyLoaders));
   }
 }
 
 void InstantController::DestroyLoaders() {
   loaders_to_destroy_.reset();
 }