autocomplete: Add AutocompleteProvider::Type enum.

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/command_line.h"
@@ skipping 58 matching lines @@
 // providers (such as SearchProvider) wait for the user to stop typing before
 // they initiate a query.
 const int kExpireTimeMS = 500;
 
 }  // namespace
 
 const int AutocompleteController::kNoItemSelected = -1;
 
 AutocompleteController::AutocompleteController(
     Profile* profile,
-    AutocompleteControllerDelegate* delegate)
+    AutocompleteControllerDelegate* delegate,
+    int provider_types)
     : delegate_(delegate),
       keyword_provider_(NULL),
+      search_provider_(NULL),
       zero_suggest_provider_(NULL),
       done_(true),
       in_start_(false),
       in_zero_suggest_(false),
       profile_(profile) {
-  search_provider_ = new SearchProvider(this, profile);
-  providers_.push_back(search_provider_);
-#if !defined(OS_ANDROID)
-  // History quick provider is enabled on all platforms other than Android.
-  bool hqp_enabled = true;
-  providers_.push_back(new HistoryQuickProvider(this, profile));
-  // Search provider/"tab to search" is enabled on all platforms other than
-  // Android.
-  keyword_provider_ = new KeywordProvider(this, profile);
-  providers_.push_back(keyword_provider_);
-#else
-  // TODO(mrossetti): Remove the following and permanently modify the
-  // HistoryURLProvider to not search titles once HQP is turned on permanently.
+  if (provider_types & AutocompleteProvider::TYPE_SEARCH) {

[Peter Kasting, 2012/09/11 00:05:39]

Nit: I'd put all these in the same order as the enum.  Added bonus: This also
puts them in the same order as the members (where applicable).

[Daniel Erat, 2012/09/11 00:42:19]

Done (had to do a bit of shuffling around since HistoryContentsProvider needs to
know if we're using HistoryQuickProvider).

But now that I remembered that there's a test that claims to be dependent on the
order in which providers are added (using the test version of this constructor),
making this part of the change scares me.  I'm going to revert back to the
non-reordered version, but I'm happy to try to land the reordering (you can see
it in patch set 7) in a separate change if you think it should be safe.

+    search_provider_ = new SearchProvider(this, profile);
+    providers_.push_back(search_provider_);
+  }
+
+  bool hqp_enabled = false;
+  // TODO(mrossetti): Permanently modify the HistoryURLProvider to not search
+  // titles once HQP is turned on permanently.
   // TODO(jcivelli): Enable the History Quick Provider and figure out why it
   // reports the wrong results for some pages.
-  bool hqp_enabled = false;
-#endif  // !OS_ANDROID
-  providers_.push_back(new HistoryURLProvider(this, profile));
-  providers_.push_back(new ShortcutsProvider(this, profile));
-  providers_.push_back(new HistoryContentsProvider(this, profile, hqp_enabled));
-  providers_.push_back(new BuiltinProvider(this, profile));
-  providers_.push_back(new ExtensionAppProvider(this, profile));
-  // Create ZeroSuggest if its switch is present.
+#if !defined(OS_ANDROID)
+  // History quick provider can be used on all platforms other than Android.
+  if (provider_types & AutocompleteProvider::TYPE_HISTORY_QUICK) {
+    hqp_enabled = true;
+    providers_.push_back(new HistoryQuickProvider(this, profile));
+  }
+
+  if (provider_types & AutocompleteProvider::TYPE_KEYWORD) {
+    // Search provider/"tab to search" can be used on all platforms other than
+    // Android.
+    keyword_provider_ = new KeywordProvider(this, profile);
+    providers_.push_back(keyword_provider_);
+  }
+#endif
+
+  if (provider_types & AutocompleteProvider::TYPE_HISTORY_URL)
+    providers_.push_back(new HistoryURLProvider(this, profile));
+  if (provider_types & AutocompleteProvider::TYPE_SHORTCUTS)
+    providers_.push_back(new ShortcutsProvider(this, profile));
+  if (provider_types & AutocompleteProvider::TYPE_HISTORY_CONTENTS) {
+    providers_.push_back(
+        new HistoryContentsProvider(this, profile, hqp_enabled));
+  }
+  if (provider_types & AutocompleteProvider::TYPE_BUILTIN)
+    providers_.push_back(new BuiltinProvider(this, profile));
+  if (provider_types & AutocompleteProvider::TYPE_EXTENSION_APP)
+    providers_.push_back(new ExtensionAppProvider(this, profile));
+
   CommandLine* cl = CommandLine::ForCurrentProcess();
-  if (cl->HasSwitch(switches::kExperimentalZeroSuggestURLPrefix)) {
+  if ((provider_types & AutocompleteProvider::TYPE_ZERO_SUGGEST) &&
+      cl->HasSwitch(switches::kExperimentalZeroSuggestURLPrefix)) {
     zero_suggest_provider_ = new ZeroSuggestProvider(this, profile,
         cl->GetSwitchValueASCII(switches::kExperimentalZeroSuggestURLPrefix));
     providers_.push_back(zero_suggest_provider_);
   }
+
   for (ACProviders::iterator i(providers_.begin()); i != providers_.end(); ++i)
     (*i)->AddRef();
 }
 
 AutocompleteController::~AutocompleteController() {
   // The providers may have tasks outstanding that hold refs to them.  We need
   // to ensure they won't call us back if they outlive us.  (Practically,
   // calling Stop() should also cancel those tasks and make it so that we hold
   // the only refs.)  We also don't want to bother notifying anyone of our
   // result changes here, because the notification observer is in the midst of
@@ skipping 311 matching lines @@
   }
   done_ = true;
 }
 
 void AutocompleteController::StartExpireTimer() {
   if (result_.HasCopiedMatches())
     expire_timer_.Start(FROM_HERE,
                         base::TimeDelta::FromMilliseconds(kExpireTimeMS),
                         this, &AutocompleteController::ExpireCopiedEntries);
 }