Remove frontend code that allows for dynamic profile setting, and read the profile off the browse...

chrome/browser/autocomplete/autocomplete_popup_model.cc

 // Copyright (c) 2011 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/autocomplete/autocomplete_popup_model.h"
 
 #include <algorithm>
 
 #include "unicode/ubidi.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "ui/gfx/rect.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupModel
 
 AutocompletePopupModel::AutocompletePopupModel(
     AutocompletePopupView* popup_view,
-    AutocompleteEditModel* edit_model,
-    Profile* profile)
+    AutocompleteEditModel* edit_model)
     : view_(popup_view),
       edit_model_(edit_model),
-      profile_(profile),
       hovered_line_(kNoMatch),
       selected_line_(kNoMatch) {
   edit_model->set_popup_model(this);
 }
 
 AutocompletePopupModel::~AutocompletePopupModel() {
 }
 
 bool AutocompletePopupModel::IsOpen() const {
   return view_->IsOpen();
@@ skipping 86 matching lines @@
   view_->OnDragCanceled();
 }
 
 bool AutocompletePopupModel::GetKeywordForMatch(const AutocompleteMatch& match,
                                                 string16* keyword) const {
   // Assume we have no keyword until we find otherwise.
   keyword->clear();
 
   if (match.template_url) {
     TemplateURLService* url_service =
-        TemplateURLServiceFactory::GetForProfile(profile_);
+        TemplateURLServiceFactory::GetForProfile(edit_model_->profile());
     if (!url_service)
       return false;
 
     // Only show the keyword for the default provider if the user typed in
     // the keyword and it isn't SEARCH_WHAT_YOU_TYPED.
     const TemplateURL* default_url = url_service->GetDefaultSearchProvider();
     if (default_url && (default_url->id() == match.template_url->id())) {
       if (StartsWith(autocomplete_controller()->input().text(),
                      default_url->keyword(), false) &&
           (match.type != AutocompleteMatch::SEARCH_WHAT_YOU_TYPED)) {
@@ skipping 14 matching lines @@
 bool AutocompletePopupModel::GetKeywordForText(const string16& text,
                                                string16* keyword) const {
   // Creates keyword_hint first in case |keyword| is a pointer to |text|.
   const string16 keyword_hint(TemplateURLService::CleanUserInputKeyword(text));
 
   // Assume we have no keyword until we find otherwise.
   keyword->clear();
 
   if (keyword_hint.empty())
     return false;
+  Profile* profile = edit_model_->profile();
   TemplateURLService* url_service =
-      TemplateURLServiceFactory::GetForProfile(profile_);
+      TemplateURLServiceFactory::GetForProfile(profile);
   if (!url_service)
     return false;
   url_service->Load();
 
   // Don't provide a hint if this keyword doesn't support replacement.
   const TemplateURL* const template_url =
       url_service->GetTemplateURLForKeyword(keyword_hint);
   if (!TemplateURL::SupportsReplacement(template_url))
     return false;
 
   // Don't provide a hint for inactive/disabled extension keywords.
   if (template_url->IsExtensionKeyword()) {
-    const Extension* extension = profile_->GetExtensionService()->
+    const Extension* extension = profile->GetExtensionService()->
         GetExtensionById(template_url->GetExtensionId(), false);
-    if (!extension ||
-        (profile_->IsOffTheRecord() &&
-         !profile_->GetExtensionService()->
-             IsIncognitoEnabled(extension->id())))
+    if (!extension || (profile->IsOffTheRecord() &&
+        !profile->GetExtensionService()->IsIncognitoEnabled(extension->id())))
       return false;
   }
 
   keyword->assign(keyword_hint);
   return true;
 }
 
 void AutocompletePopupModel::Move(int count) {
   const AutocompleteResult& result = this->result();
   if (result.empty())
@@ skipping 39 matching lines @@
       SetSelectedLine(selected_line, false, true);
     }
   }
 }
 
 const SkBitmap* AutocompletePopupModel::GetIconIfExtensionMatch(
     const AutocompleteMatch& match) const {
   if (!match.template_url || !match.template_url->IsExtensionKeyword())
     return NULL;
 
-  return &profile_->GetExtensionService()->GetOmniboxPopupIcon(
+  return &edit_model_->profile()->GetExtensionService()->GetOmniboxPopupIcon(
       match.template_url->GetExtensionId());
 }
 
 void AutocompletePopupModel::OnResultChanged() {
   const AutocompleteResult& result = this->result();
   selected_line_ = result.default_match() == result.end() ?
       kNoMatch : static_cast<size_t>(result.default_match() - result.begin());
   // There had better not be a nonempty result set with no default match.
   CHECK((selected_line_ != kNoMatch) || result.empty());
   manually_selected_match_.Clear();
   // If we're going to trim the window size to no longer include the hovered
   // line, turn hover off.  Practically, this shouldn't happen, but it
   // doesn't hurt to be defensive.
   if ((hovered_line_ != kNoMatch) && (result.size() <= hovered_line_))
     SetHoveredLine(kNoMatch);
 
   view_->UpdatePopupAppearance();
 }