WebUI: work around a crash triggered by a specific navigation in tabbed options.

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 58 matching lines @@
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "passwordsPage",
                 IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE);
 
   localized_strings->SetString("passwordManagerLearnMoreURL",
       google_util::AppendGoogleLocaleParam(
           GURL(chrome::kPasswordManagerLearnMoreURL)).spec());
 }
 
 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);
   // 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_);
@@ skipping 79 matching lines @@
 void PasswordManagerHandler::RemoveAllPasswordExceptions(
     const ListValue* args) {
   PasswordStore* store = GetPasswordStore();
   if (!store)
     return;
   for (size_t i = 0; i < password_exception_list_.size(); ++i)
     store->RemoveLogin(*password_exception_list_[i]);
 }
 
 void PasswordManagerHandler::SetPasswordList() {
+  // Due to the way that handlers are (re)initialized under certain types of
+  // navigation, we may not be initialized yet. (See bugs 88986 and 86448.)
+  // If this is the case, initialize on demand. This is a hack.
+  // TODO(mdm): remove this hack once it is no longer necessary.
+  if (show_passwords_.GetPrefName().empty())
+    Initialize();
+
   ListValue entries;
   bool show_passwords = *show_passwords_;
   string16 empty;
   for (size_t i = 0; i < password_list_.size(); ++i) {
     ListValue* entry = new ListValue();
     entry->Append(new StringValue(net::FormatUrl(password_list_[i]->origin,
                                                  languages_)));
     entry->Append(new StringValue(password_list_[i]->username_value));
     entry->Append(new StringValue(
         show_passwords ? password_list_[i]->password_value : empty));
@@ skipping 73 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();
 }