Password bubble: Create subviews for ManagePasswordsBubbleView.

chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

 // Copyright 2013 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/passwords/manage_passwords_bubble_model.h"
 
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::WebContents;
 using autofill::PasswordFormMap;
 
 ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       web_contents_(web_contents),
       display_disposition_(
           password_manager::metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING),
       dismissal_reason_(password_manager::metrics_util::NOT_DISPLAYED) {
   ManagePasswordsBubbleUIController* manage_passwords_bubble_ui_controller =
       ManagePasswordsBubbleUIController::FromWebContents(web_contents_);
 
-  if (manage_passwords_bubble_ui_controller->password_to_be_saved())
+  if (manage_passwords_bubble_ui_controller->password_to_be_saved()) {
     manage_passwords_bubble_state_ = PASSWORD_TO_BE_SAVED;
-  else
+    pending_credentials_ =
+        manage_passwords_bubble_ui_controller->PendingCredentials();

[Mike West, 2014/04/28 12:41:18]

This was getting called regardless of the model's state, which crashed at the
|DCHECK(form_manager_)|. That was masked in tests because we've mocked out the
pendingcredentials call. :(

+  } else {
     manage_passwords_bubble_state_ = MANAGE_PASSWORDS;
+  }
 
   title_ = l10n_util::GetStringUTF16(
       (manage_passwords_bubble_state_ == PASSWORD_TO_BE_SAVED) ?
           IDS_SAVE_PASSWORD : IDS_MANAGE_PASSWORDS);
-  pending_credentials_ =
-      manage_passwords_bubble_ui_controller->PendingCredentials();
   best_matches_ = manage_passwords_bubble_ui_controller->best_matches();
   manage_link_ =
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK);
 }
 
 ManagePasswordsBubbleModel::~ManagePasswordsBubbleModel() {}
 
 void ManagePasswordsBubbleModel::OnBubbleShown(
     ManagePasswordsBubble::DisplayReason reason) {
   DCHECK(WaitingToSavePassword() ||
@@ skipping 79 matching lines @@
     password_store->RemoveLogin(password_form);
   else
     password_store->AddLogin(password_form);
 }
 
 void ManagePasswordsBubbleModel::WebContentsDestroyed(
     content::WebContents* web_contents) {
   // The WebContents have been destroyed.
   web_contents_ = NULL;
 }