Centralize logic around Instant modes.

chrome/browser/autocomplete/search_provider.cc

 // Copyright (c) 2012 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/autocomplete/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/callback.h"
@@ skipping 111 matching lines @@
 SearchProvider::SearchProvider(AutocompleteProviderListener* listener,
                                Profile* profile)
     : AutocompleteProvider(listener, profile, "Search"),
       providers_(TemplateURLServiceFactory::GetForProfile(profile)),
       suggest_results_pending_(0),
       suggest_field_trial_group_number_(
           AutocompleteFieldTrial::GetSuggestNumberOfGroups()),
       has_suggested_relevance_(false),
       verbatim_relevance_(-1),
       have_suggest_results_(false),
-      instant_finalized_(false) {
+      instant_finalized_(false),
+      instant_suggest_enabled_(false) {
   // Above, we default |suggest_field_trial_group_number_| to the number of
   // groups to mean "not in field trial."  Field trial groups run from 0 to
   // GetSuggestNumberOfGroups() - 1 (inclusive).
   if (AutocompleteFieldTrial::InSuggestFieldTrial()) {
     suggest_field_trial_group_number_ =
         AutocompleteFieldTrial::GetSuggestGroupNameAsNumber();
   }
   // Add a beacon to the logs that'll allow us to identify later what
   // suggest field trial group a user is in.  Do this by incrementing a
   // bucket in a histogram, where the bucket represents the user's
@@ skipping 542 matching lines @@
   }
 
   // 5th element: Optional key-value pairs from the Suggest server.
   ListValue* types = NULL;
   ListValue* relevances = NULL;
   DictionaryValue* extras = NULL;
   if (root_list->GetDictionary(4, &extras)) {
     extras->GetList("google:suggesttype", &types);
 
     // Only accept relevance suggestions if Instant is disabled.
-    if (!is_keyword && !InstantController::IsEnabled(profile_)) {
+    if (!is_keyword && !instant_suggest_enabled_) {
       // Discard this list if its size does not match that of the suggestions.
       if (extras->GetList("google:suggestrelevance", &relevances) &&
           relevances->GetSize() != results->GetSize())
         relevances = NULL;
 
       extras->GetInteger("google:verbatimrelevance", &verbatim_relevance_);
     }
   }
 
   SuggestResults* suggest_results =
@@ skipping 534 matching lines @@
   match.description = navigation.description();
   AutocompleteMatch::ClassifyMatchInString(input, match.description,
       ACMatchClassification::NONE, &match.description_class);
   return match;
 }
 
 void SearchProvider::UpdateDone() {
   // We're done when there are no more suggest queries pending (this is set to 1
   // when the timer is started) and we're not waiting on instant.
   done_ = ((suggest_results_pending_ == 0) &&
-           (instant_finalized_ || !InstantController::IsEnabled(profile_)));
+           (instant_finalized_ || !instant_suggest_enabled_));
 }