Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / autocomplete / autocomplete_classifier_factory.cc

diff --git a/src/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/src/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
index ffb9781..4fb0336 100644 (file)
--- a/src/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
+++ b/src/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
@@ -5,13 +5,18 @@
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
+#include "chrome/browser/autocomplete/autocomplete_controller.h"
+#include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
+
+#if defined(ENABLE_EXTENSIONS)
 #include "extensions/browser/extension_system_provider.h"
 #include "extensions/browser/extensions_browser_client.h"
+#endif
 
 // static
 AutocompleteClassifier* AutocompleteClassifierFactory::GetForProfile(
@@ -27,16 +32,24 @@ AutocompleteClassifierFactory* AutocompleteClassifierFactory::GetInstance() {
 
 // static
 KeyedService* AutocompleteClassifierFactory::BuildInstanceFor(
-    content::BrowserContext* profile) {
-  return new AutocompleteClassifier(static_cast<Profile*>(profile));
+    content::BrowserContext* context) {
+  Profile* profile = static_cast<Profile*>(context);
+  return new AutocompleteClassifier(
+      make_scoped_ptr(new AutocompleteController(
+          profile, TemplateURLServiceFactory::GetForProfile(profile), NULL,
+          AutocompleteClassifier::kDefaultOmniboxProviders)),
+      scoped_ptr<AutocompleteSchemeClassifier>(
+          new ChromeAutocompleteSchemeClassifier(profile)));
 }
 
 AutocompleteClassifierFactory::AutocompleteClassifierFactory()
     : BrowserContextKeyedServiceFactory(
         "AutocompleteClassifier",
         BrowserContextDependencyManager::GetInstance()) {
+#if defined(ENABLE_EXTENSIONS)
   DependsOn(
       extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
+#endif
   DependsOn(TemplateURLServiceFactory::GetInstance());
   // TODO(pkasting): Uncomment these once they exist.
   //   DependsOn(PrefServiceFactory::GetInstance());