autocomplete: Add AutocompleteProvider::Type enum.

chrome/browser/ui/webui/omnibox/omnibox_ui_handler.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/ui/webui/omnibox/omnibox_ui_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/values.h"
+#include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "content/public/browser/web_ui.h"
 
 OmniboxUIHandler::OmniboxUIHandler(Profile* profile ) {
-  controller_.reset(new AutocompleteController(profile, this));
+  controller_.reset(new AutocompleteController(profile, this,
+      AutocompleteClassifier::kDefaultOmniboxProviders));
 }
 
 OmniboxUIHandler::~OmniboxUIHandler() {}
 
 void OmniboxUIHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("startOmniboxQuery",
       base::Bind(&OmniboxUIHandler::StartOmniboxQuery,
                  base::Unretained(this)));
 }
 
@@ skipping 37 matching lines @@
   // Fill in general information.
   result_to_output.SetBoolean("done", controller_->done());
   result_to_output.SetInteger("time_since_omnibox_started_ms",
       (base::Time::Now() - time_omnibox_started_).InMilliseconds());
   // Fill in the merged/combined results the controller has provided.
   AddResultToDictionary("combined_results", controller_->result().begin(),
                         controller_->result().end(), &result_to_output);
   // Fill results from each individual provider as well.
   for (ACProviders::const_iterator it(controller_->providers()->begin());
        it != controller_->providers()->end(); ++it) {
-    AddResultToDictionary(std::string("results_by_provider.") + (*it)->name(),
+    AddResultToDictionary(
+        std::string("results_by_provider.") + (*it)->GetName(),
         (*it)->matches().begin(), (*it)->matches().end(), &result_to_output);
   }
   // Add done; send the results.
   web_ui()->CallJavascriptFunction("omniboxDebug.handleNewAutocompleteResult",
                                    result_to_output);
 }
 
 // For details on the format of the DictionaryValue that this function
 // populates, see the comments by OnResultChanged().
 void OmniboxUIHandler::AddResultToDictionary(const std::string& prefix,
                                              ACMatches::const_iterator it,
                                              ACMatches::const_iterator end,
                                              base::DictionaryValue* output) {
   int i = 0;
   for (; it != end; ++it, ++i) {
     std::string item_prefix(prefix + StringPrintf(".item_%d", i));
     if (it->provider != NULL) {
-      output->SetString(item_prefix + ".provider_name", it->provider->name());
+      output->SetString(item_prefix + ".provider_name",
+                        it->provider->GetName());
       output->SetBoolean(item_prefix + ".provider_done", it->provider->done());
     }
     output->SetInteger(item_prefix + ".relevance", it->relevance);
     output->SetBoolean(item_prefix + ".deletable", it->deletable);
     output->SetString(item_prefix + ".fill_into_edit", it->fill_into_edit);
     output->SetInteger(item_prefix + ".inline_autocomplete_offset",
                        it->inline_autocomplete_offset);
     output->SetString(item_prefix + ".destination_url",
                       it->destination_url.spec());
     output->SetString(item_prefix + ".contents", it->contents);
@@ skipping 35 matching lines @@
   // query before it starts the new one.  By the way, in this call to
   // Start(), we use the default/typical values for all parameters.
   time_omnibox_started_ = base::Time::Now();
   controller_->Start(input_string,
                      empty_string,  // user's desired tld (top-level domain)
                      false,  // don't prevent inline autocompletion
                      false,  // no preferred keyword provider
                      true,  // allow exact keyword matches
                      AutocompleteInput::ALL_MATCHES);  // want all matches
 }