Disable most of search provider for Instant Extended

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 19 matching lines @@
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/browser/ui/search/search.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/url_util.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_util.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
@@ skipping 216 matching lines @@
           ACMatchClassification(0, ACMatchClassification::NONE));
       match.keyword = providers_.default_provider();
       matches_.push_back(match);
     }
     Stop(false);
     return;
   }
 
   input_ = input;
 
-  DoHistoryQuery(minimal_changes);
-  StartOrStopSuggestQuery(minimal_changes);
+  // Don't run the normal provider flow when the Instant Extended API is
+  // enabled.  (When the Extended API is enabled, the embedded page will handle
+  // all search suggestions itself.)
+  // TODO(dcblack): once we are done refactoring the omnibox so we don't need to
+  // use FinalizeInstantQuery anymore, we can take out this check and remove
+  // this provider from kInstantExtendedOmniboxProviders.
+  if (!chrome::search::IsInstantExtendedAPIEnabled(profile_)) {
+    DoHistoryQuery(minimal_changes);
+    StartOrStopSuggestQuery(minimal_changes);
+  }
   ConvertResultsToAutocompleteMatches();
 }
 
 SearchProvider::Result::Result(int relevance) : relevance_(relevance) {}
 SearchProvider::Result::~Result() {}
 
 SearchProvider::SuggestResult::SuggestResult(const string16& suggestion,
                                              int relevance)
     : Result(relevance),
       suggestion_(suggestion) {
@@ skipping 945 matching lines @@
   return match;
 }
 
 void SearchProvider::UpdateDone() {
   // We're done when the timer isn't running, there are no suggest queries
   // pending, and we're not waiting on instant.
   done_ = (!timer_.IsRunning() && (suggest_results_pending_ == 0) &&
            (instant_finalized_ ||
             !InstantController::IsSuggestEnabled(profile_)));
 }