autocomplete: Add AutocompleteProvider::Type enum.

chrome/browser/autocomplete/autocomplete_provider_unittest.cc

Index: chrome/browser/autocomplete/autocomplete_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
index 61d9cc4fefe78de142f069e5f526ea4909de1fff..d615bbd44048c0c3bc1136dc87f7e9ae7822e098 100644
--- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
@@ -45,7 +45,7 @@ class TestProvider : public AutocompleteProvider {
   TestProvider(int relevance, const string16& prefix,
                Profile* profile,
                const string16 match_keyword)
-      : AutocompleteProvider(NULL, profile, ""),
+      : AutocompleteProvider(NULL, profile, AutocompleteProvider::TYPE_SEARCH),
         relevance_(relevance),
         prefix_(prefix),
         match_keyword_(match_keyword) {
@@ -333,15 +333,9 @@ void AutocompleteProviderTest::ResetControllerWithKeywordProvider() {
   // Release() them below, when we delete it during the call to reset().
   providers_.clear();
 
-  // Create both a keyword and search provider, and add them in that order.
-  // (Order is important; see comments in RunExactKeymatchTest().)
-  KeywordProvider* keyword_provider = new KeywordProvider(NULL, &profile_);
-  keyword_provider->AddRef();
-  providers_.push_back(keyword_provider);
-
-  AutocompleteController* controller =
-      new AutocompleteController(providers_, &profile_);
-  controller->set_keyword_provider(keyword_provider);
+  AutocompleteController* controller = new AutocompleteController(&profile_,

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

Nit: Even shorter:

  controller_.reset(new ...);
  providers_.push_back(controller_->keyword_provider());

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

Done.

+      NULL, AutocompleteProvider::TYPE_KEYWORD);
+  providers_.push_back(controller->keyword_provider());
   controller_.reset(controller);
 }
 
@@ -564,4 +558,3 @@ TEST_F(AutocompleteProviderTest, UpdateAssistedQueryStats) {
     RunAssistedQueryStatsTest(test_data, ARRAYSIZE_UNSAFE(test_data));
   }
 }
-