Prepare AutocompleteController for componentization

chrome/browser/ui/omnibox/omnibox_controller.cc

 // Copyright 2013 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/omnibox/omnibox_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
+#include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ skipping 75 matching lines @@
 }
 
 }  // namespace
 
 OmniboxController::OmniboxController(OmniboxEditModel* omnibox_edit_model,
                                      Profile* profile)
     : omnibox_edit_model_(omnibox_edit_model),
       profile_(profile),
       popup_(NULL),
       autocomplete_controller_(new AutocompleteController(
-          profile,
-          TemplateURLServiceFactory::GetForProfile(profile),
+          make_scoped_ptr(new ChromeAutocompleteProviderClient(profile)),
           this,
           AutocompleteClassifier::kDefaultOmniboxProviders)),
       request_id_(BitmapFetcherService::REQUEST_ID_INVALID),
       weak_ptr_factory_(this) {
 }
 
 OmniboxController::~OmniboxController() {
   BitmapFetcherService* image_service =
       BitmapFetcherServiceFactory::GetForBrowserContext(profile_);
   if (image_service)
@@ skipping 93 matching lines @@
     // We could prefetch the alternate nav URL, if any, but because there
     // can be many of these as a user types an initial series of characters,
     // the OS DNS cache could suffer eviction problems for minimal gain.
   }
 }
 
 void OmniboxController::SetAnswerBitmap(const SkBitmap& bitmap) {
   request_id_ = BitmapFetcherService::REQUEST_ID_INVALID;
   popup_->SetAnswerBitmap(bitmap);
 }