Revert of Reduces dependency from AutocompleteMatch to Profile.

chrome/browser/ui/views/frame/test_with_browser_view.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/views/frame/test_with_browser_view.h"
 
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/predictors/predictor_database.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #endif
 
 namespace {
 
 // Caller owns the returned service.
 KeyedService* CreateTemplateURLService(content::BrowserContext* profile) {
   return new TemplateURLService(static_cast<Profile*>(profile), NULL);
 }
 
-KeyedService* CreateAutocompleteClassifier(content::BrowserContext* context) {
-  Profile* profile = static_cast<Profile*>(context);
+KeyedService* CreateAutocompleteClassifier(content::BrowserContext* profile) {
   return new AutocompleteClassifier(
       make_scoped_ptr(new AutocompleteController(
-          profile, TemplateURLServiceFactory::GetForProfile(profile), NULL,
+          static_cast<Profile*>(profile), NULL,
           AutocompleteClassifier::kDefaultOmniboxProviders)),
       scoped_ptr<AutocompleteSchemeClassifier>(new TestSchemeClassifier()));
 }
 
 }  // namespace
 
 TestWithBrowserView::TestWithBrowserView() {
 }
 
 TestWithBrowserView::TestWithBrowserView(
@@ skipping 53 matching lines @@
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactory(
       profile, &CreateAutocompleteClassifier);
   return profile;
 }
 
 BrowserWindow* TestWithBrowserView::CreateBrowserWindow() {
   // Allow BrowserWithTestWindowTest to use Browser to create the default
   // BrowserView and BrowserFrame.
   return NULL;
 }