Assume all providers may give zero suggest responses.

chrome/browser/autocomplete/autocomplete_controller.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/autocomplete_controller.h"
 
 #include <set>
 #include <string>
 
 #include "base/format_macros.h"
@@ skipping 244 matching lines @@
   expire_timer_.Stop();
   stop_timer_.Stop();
 
   // Start the new query.
   in_start_ = true;
   base::TimeTicks start_time = base::TimeTicks::Now();
   for (Providers::iterator i(providers_.begin()); i != providers_.end(); ++i) {
     // TODO(mpearson): Remove timing code once bugs 178705 / 237703 / 168933
     // are resolved.
     base::TimeTicks provider_start_time = base::TimeTicks::Now();
-
-    // Call Start() on ZeroSuggestProvider with an INVALID AutocompleteInput
-    // to clear out zero-suggest |matches_|.
-    if (i->get() == zero_suggest_provider_)
-      (*i)->Start(AutocompleteInput(), minimal_changes);
-    else
-      (*i)->Start(input_, minimal_changes);
-
+    (*i)->Start(input_, minimal_changes, false);
     if (!input.want_asynchronous_matches())
       DCHECK((*i)->done());
     base::TimeTicks provider_end_time = base::TimeTicks::Now();
     std::string name = std::string("Omnibox.ProviderTime.") + (*i)->GetName();
     base::HistogramBase* counter = base::Histogram::FactoryGet(
         name, 1, 5000, 20, base::Histogram::kUmaTargetedHistogramFlag);
     counter->Add(static_cast<int>(
         (provider_end_time - provider_start_time).InMilliseconds()));
   }
   if (input.want_asynchronous_matches() && (input.text().length() < 6)) {
@@ skipping 43 matching lines @@
     NotifyChanged(false);
   }
 }
 
 void AutocompleteController::OnOmniboxFocused(const AutocompleteInput& input) {
   DCHECK(!in_start_);  // We should not be already running a query.
 
   // Call Start() on all prefix-based providers with an INVALID
   // AutocompleteInput to clear out cached |matches_|, which ensures that
   // they aren't used with zero suggest.
-  for (Providers::iterator i(providers_.begin()); i != providers_.end(); ++i) {
-    if ((*i)->ProvidesMatchesOnOmniboxFocus())
-      (*i)->Start(input, false);
-    else
-      (*i)->Start(AutocompleteInput(), false);
-  }
+  for (Providers::iterator i(providers_.begin()); i != providers_.end(); ++i)
+    (*i)->Start(input, false, true);
 
   UpdateResult(false, false);
 }
 
 void AutocompleteController::DeleteMatch(const AutocompleteMatch& match) {
   DCHECK(match.SupportsDeletion());
 
   // Delete duplicate matches attached to the main match first.
   for (ACMatches::const_iterator it(match.duplicate_matches.begin());
        it != match.duplicate_matches.end(); ++it) {
@@ skipping 323 matching lines @@
                         this, &AutocompleteController::ExpireCopiedEntries);
 }
 
 void AutocompleteController::StartStopTimer() {
   stop_timer_.Start(FROM_HERE,
                     stop_timer_duration_,
                     base::Bind(&AutocompleteController::Stop,
                                base::Unretained(this),
                                false));
 }