Revert of Reduces dependency from AutocompleteMatch to Profile.

chrome/browser/android/omnibox/autocomplete_controller_android.cc

Index: chrome/browser/android/omnibox/autocomplete_controller_android.cc
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
index 8bb2fc62f24808954bf0b6278bea4241ca6430aa..2ff97d5fa99a0881a37974979cff71eea72a1ac9 100644
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
@@ -82,8 +82,7 @@
 
 ZeroSuggestPrefetcher::ZeroSuggestPrefetcher(Profile* profile)
     : controller_(new AutocompleteController(
-          profile, TemplateURLServiceFactory::GetForProfile(profile), this,
-          AutocompleteProvider::TYPE_ZERO_SUGGEST)) {
+          profile, this, AutocompleteProvider::TYPE_ZERO_SUGGEST)) {
   // Creating an arbitrary fake_request_source to avoid passing in an invalid
   // AutocompleteInput object.
   base::string16 fake_request_source(base::ASCIIToUTF16(
@@ -116,8 +115,7 @@
 
 AutocompleteControllerAndroid::AutocompleteControllerAndroid(Profile* profile)
     : autocomplete_controller_(new AutocompleteController(
-          profile, TemplateURLServiceFactory::GetForProfile(profile), this,
-          kAndroidAutocompleteProviders)),
+          profile, this, kAndroidAutocompleteProviders)),
       inside_synchronous_start_(false),
       profile_(profile) {
 }