Prepare AutocompleteController for componentization

chrome/browser/autocomplete/autocomplete_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CONTROLLER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
 #include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/autocomplete_provider.h"
+#include "components/omnibox/autocomplete_provider_client.h"
 #include "components/omnibox/autocomplete_provider_listener.h"
 #include "components/omnibox/autocomplete_result.h"
 
 class AutocompleteControllerDelegate;
 class HistoryURLProvider;
 class KeywordProvider;
-class Profile;
 class SearchProvider;
 class TemplateURLService;
 class ZeroSuggestProvider;
 
 // The AutocompleteController is the center of the autocomplete system.  A
 // class creates an instance of the controller, which in turn creates a set of
 // AutocompleteProviders to serve it.  The owning class can ask the controller
 // to Start() a query; the controller in turn passes this call down to the
 // providers, each of which keeps track of its own matches and whether it has
 // finished processing the query.  When a provider gets more matches or finishes
@@ skipping 12 matching lines @@
 // The coordinator for autocomplete queries, responsible for combining the
 // matches from a series of providers into one AutocompleteResult.
 class AutocompleteController : public AutocompleteProviderListener {
  public:
   typedef std::vector<scoped_refptr<AutocompleteProvider> > Providers;
 
   // |provider_types| is a bitmap containing AutocompleteProvider::Type values
   // that will (potentially, depending on platform, flags, etc.) be
   // instantiated. |template_url_service| is used to create URLs from the
   // autocomplete results.
-  AutocompleteController(Profile* profile,
-                         TemplateURLService* template_url_service,
+  AutocompleteController(scoped_ptr<AutocompleteProviderClient> provider_client,
                          AutocompleteControllerDelegate* delegate,
                          int provider_types);
   ~AutocompleteController() override;
 
   // Starts an autocomplete query, which continues until all providers are
   // done or the query is Stop()ed.  It is safe to Start() a new query without
   // Stop()ing the previous one.
   //
   // See AutocompleteInput::AutocompleteInput(...) for more details regarding
   // |input| params.
@@ skipping 125 matching lines @@
   void StartStopTimer();
 
   // Helper function for Stop().  |due_to_user_inactivity| means this call was
   // triggered by a user's idleness, i.e., not an explicit user action.
   void StopHelper(bool clear_result,
                   bool due_to_user_inactivity);
 
   AutocompleteControllerDelegate* delegate_;
 
   // The client passed to the providers.
-  scoped_ptr<ChromeAutocompleteProviderClient> provider_client_;
+  scoped_ptr<AutocompleteProviderClient> provider_client_;
 
   // A list of all providers.
   Providers providers_;
 
   HistoryURLProvider* history_url_provider_;
 
   KeywordProvider* keyword_provider_;
 
   SearchProvider* search_provider_;
 
@@ skipping 37 matching lines @@
   // Are we in Start()? This is used to avoid updating |result_| and sending
   // notifications until Start() has been invoked on all providers.
   bool in_start_;
 
   TemplateURLService* template_url_service_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteController);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CONTROLLER_H_