Revert of Reduces dependency from AutocompleteMatch to Profile.

chrome/browser/ui/omnibox/omnibox_popup_model.cc

 // 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.
 
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 
 #include <algorithm>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 141 matching lines @@
   selected_line_state_ = NORMAL;
   selected_line_ = line;
   view_->InvalidateLine(prev_selected_line);
   view_->InvalidateLine(selected_line_);
 
   // Update the edit with the new data for this match.
   // TODO(pkasting): If |selected_line_| moves to the controller, this can be
   // eliminated and just become a call to the observer on the edit.
   base::string16 keyword;
   bool is_keyword_hint;
-  TemplateURLService* service =
-      TemplateURLServiceFactory::GetForProfile(edit_model_->profile());
-  match.GetKeywordUIState(service, &keyword, &is_keyword_hint);
+  match.GetKeywordUIState(edit_model_->profile(), &keyword, &is_keyword_hint);
 
   if (reset_to_default) {
     edit_model_->OnPopupDataChanged(match.inline_autocompletion, NULL,
                                     keyword, is_keyword_hint);
   } else {
     edit_model_->OnPopupDataChanged(match.fill_into_edit, &current_destination,
                                     keyword, is_keyword_hint);
   }
 
   // Repaint old and new selected lines immediately, so that the edit doesn't
@@ skipping 62 matching lines @@
       // before notifying us, reducing flicker.  At that point the check for
       // deletability can move there too.
       SetSelectedLine(selected_line, false, true);
     }
   }
 }
 
 gfx::Image OmniboxPopupModel::GetIconIfExtensionMatch(
     const AutocompleteMatch& match) const {
   Profile* profile = edit_model_->profile();
-  TemplateURLService* service =
-      TemplateURLServiceFactory::GetForProfile(profile);
-  const TemplateURL* template_url = match.GetTemplateURL(service, false);
+  const TemplateURL* template_url = match.GetTemplateURL(profile, false);
   if (template_url &&
       (template_url->GetType() == TemplateURL::OMNIBOX_API_EXTENSION)) {
     return extensions::OmniboxAPI::Get(profile)->GetOmniboxPopupIcon(
         template_url->GetExtensionId());
   }
   return gfx::Image();
 }
 
 void OmniboxPopupModel::OnResultChanged() {
   const AutocompleteResult& result = this->result();
@@ skipping 18 matching lines @@
   }
 }
 
 void OmniboxPopupModel::AddObserver(OmniboxPopupModelObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void OmniboxPopupModel::RemoveObserver(OmniboxPopupModelObserver* observer) {
   observers_.RemoveObserver(observer);
 }