Prepare AutocompleteController for componentization

chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc

 // Copyright 2014 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/keyword_extensions_delegate_impl.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/omnibox/keyword_provider.h"
+#include "components/omnibox/mock_autocomplete_provider_client.h"
 #include "components/search_engines/template_url_service.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/common/extension.h"
 
 namespace extensions {
 
 namespace {
 
 class ScopedExtensionLoadObserver : public ExtensionRegistryObserver {
@@ skipping 45 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(KeywordExtensionsDelegateImplTest);
 };
 
 void KeywordExtensionsDelegateImplTest::SetUp() {
   ExtensionServiceTestBase::SetUp();
   InitializeExtensionService(CreateDefaultInitParams());
 }
 
 void KeywordExtensionsDelegateImplTest::RunTest(bool incognito) {
-  TemplateURLService empty_model(NULL, 0);
+  scoped_ptr<TemplateURLService> empty_model(new TemplateURLService(NULL, 0));
+  MockAutocompleteProviderClient client;
+  client.set_template_url_service(empty_model.Pass());
   scoped_refptr<KeywordProvider> keyword_provider =
-      new KeywordProvider(NULL, &empty_model);
+      new KeywordProvider(&client, nullptr);
 
   // Load an extension.
   {
     base::FilePath path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &path));
     path = path.AppendASCII("extensions").AppendASCII("good_unpacked");
 
     base::RunLoop run_loop;
     ScopedExtensionLoadObserver load_observer(registry(),
                                               run_loop.QuitClosure());
@@ skipping 38 matching lines @@
   RunTest(false);
 }
 
 TEST_F(KeywordExtensionsDelegateImplTest, IsEnabledExtensionIncognito) {
   RunTest(true);
 }
 
 }  // namespace
 
 }  // namespace extensions