Password bubble: Create subviews for ManagePasswordsBubbleView.

chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

Index: chrome/browser/ui/passwords/manage_passwords_bubble_model.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc b/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc
index 687dca2a90f47b1367a8f3b141ddb4acef686fd8..4d863737b4143c335e4cd8324af407afc4f22faf 100644
--- a/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc
@@ -25,16 +25,17 @@ ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(
   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);