Removal of Profile from content part 6.

chrome/browser/ui/webui/options/password_manager_handler.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/ui/webui/options/password_manager_handler.h"
 
 #include "base/callback.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 66 matching lines @@
 
 void PasswordManagerHandler::Initialize() {
   // Due to the way that handlers are (re)initialized under certain types of
   // navigation, we may already be initialized. (See bugs 88986 and 86448.)
   // If this is the case, return immediately. This is a hack.
   // TODO(mdm): remove this hack once it is no longer necessary.
   if (!show_passwords_.GetPrefName().empty())
     return;
 
   show_passwords_.Init(prefs::kPasswordManagerAllowShowPasswords,
-                       web_ui_->GetProfile()->GetPrefs(), this);
+                       Profile::FromWebUI(web_ui_)->GetPrefs(), this);
   // We should not cache web_ui_->GetProfile(). See crosbug.com/6304.
   PasswordStore* store = GetPasswordStore();
   if (store)
     store->AddObserver(this);
 }
 
 void PasswordManagerHandler::RegisterMessages() {
   DCHECK(web_ui_);
 
   web_ui_->RegisterMessageCallback("updatePasswordLists",
       NewCallback(this, &PasswordManagerHandler::UpdatePasswordLists));
   web_ui_->RegisterMessageCallback("removeSavedPassword",
       NewCallback(this, &PasswordManagerHandler::RemoveSavedPassword));
   web_ui_->RegisterMessageCallback("removePasswordException",
       NewCallback(this, &PasswordManagerHandler::RemovePasswordException));
   web_ui_->RegisterMessageCallback("removeAllSavedPasswords",
       NewCallback(this, &PasswordManagerHandler::RemoveAllSavedPasswords));
   web_ui_->RegisterMessageCallback("removeAllPasswordExceptions", NewCallback(
       this, &PasswordManagerHandler::RemoveAllPasswordExceptions));
 }
 
 void PasswordManagerHandler::OnLoginsChanged() {
   UpdatePasswordLists(NULL);
 }
 
 PasswordStore* PasswordManagerHandler::GetPasswordStore() {
-  return web_ui_->GetProfile()->GetPasswordStore(Profile::EXPLICIT_ACCESS);
+  return Profile::FromWebUI(web_ui_)->
+      GetPasswordStore(Profile::EXPLICIT_ACCESS);
 }
 
 void PasswordManagerHandler::Observe(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     std::string* pref_name = Details<std::string>(details).ptr();
     if (*pref_name == prefs::kPasswordManagerAllowShowPasswords) {
       UpdatePasswordLists(NULL);
     }
   }
 
   OptionsPageUIHandler::Observe(type, source, details);
 }
 
 void PasswordManagerHandler::UpdatePasswordLists(const ListValue* args) {
   // Reset the current lists.
   password_list_.reset();
   password_exception_list_.reset();
 
-  languages_ =
-      web_ui_->GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages);
+  languages_ = Profile::FromWebUI(web_ui_)->GetPrefs()->
+      GetString(prefs::kAcceptLanguages);
   populater_.Populate();
   exception_populater_.Populate();
 }
 
 void PasswordManagerHandler::RemoveSavedPassword(const ListValue* args) {
   PasswordStore* store = GetPasswordStore();
   if (!store)
     return;
   std::string string_value = UTF16ToUTF8(ExtractStringValue(args));
   int index;
@@ skipping 128 matching lines @@
     OnPasswordStoreRequestDone(
         CancelableRequestProvider::Handle handle,
         const std::vector<webkit_glue::PasswordForm*>& result) {
   DCHECK_EQ(pending_login_query_, handle);
   pending_login_query_ = 0;
   page_->password_exception_list_.reset();
   page_->password_exception_list_.insert(page_->password_exception_list_.end(),
                                          result.begin(), result.end());
   page_->SetPasswordExceptionList();
 }