Integrate ManagePasswordsState into ManagePasswordsUIController.

chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc

 // Copyright 2014 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 "base/metrics/histogram_samples.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
@@ skipping 25 matching lines @@
     model_.reset(new ManagePasswordsBubbleModel(test_web_contents_.get()));
   }
 
   void TearDown() override { model_.reset(); }
 
   PrefService* prefs() { return profile_.GetPrefs(); }
 
   void PretendPasswordWaiting() {
     model_->set_state(password_manager::ui::PENDING_PASSWORD_STATE);
     model_->OnBubbleShown(ManagePasswordsBubble::AUTOMATIC);
-    controller()->SetState(
-        password_manager::ui::PENDING_PASSWORD_STATE);
   }
 
   void PretendCredentialsWaiting() {
     model_->set_state(password_manager::ui::CREDENTIAL_REQUEST_STATE);
     model_->OnBubbleShown(ManagePasswordsBubble::AUTOMATIC);
-    controller()->SetState(password_manager::ui::CREDENTIAL_REQUEST_STATE);
   }
 
   void PretendAutoSigningIn() {
     model_->set_state(password_manager::ui::AUTO_SIGNIN_STATE);
     model_->OnBubbleShown(ManagePasswordsBubble::AUTOMATIC);
-    controller()->SetState(password_manager::ui::AUTO_SIGNIN_STATE);
   }
 
   void PretendManagingPasswords() {
     model_->set_state(password_manager::ui::MANAGE_STATE);
     model_->OnBubbleShown(ManagePasswordsBubble::USER_ACTION);
-    controller()->SetState(password_manager::ui::MANAGE_STATE);
   }
 
   void PretendBlacklisted() {
     model_->set_state(password_manager::ui::BLACKLIST_STATE);
     model_->OnBubbleShown(ManagePasswordsBubble::USER_ACTION);
-
-    base::string16 kTestUsername = base::ASCIIToUTF16("test_username");
-    autofill::ConstPasswordFormMap map;
-    map[kTestUsername] = &test_form_;
-    controller()->SetPasswordFormMap(map);
-    controller()->SetState(password_manager::ui::BLACKLIST_STATE);
   }
 
   ManagePasswordsUIControllerMock* controller() {
     return static_cast<ManagePasswordsUIControllerMock*>(
         ManagePasswordsUIController::FromWebContents(
             test_web_contents_.get()));
   }
 
  protected:
   scoped_ptr<ManagePasswordsBubbleModel> model_;
@@ skipping 133 matching lines @@
 TEST_F(ManagePasswordsBubbleModelTest, ClickUnblacklist) {
   base::HistogramTester histogram_tester;
   PretendBlacklisted();
   model_->OnUnblacklistClicked();
   model_->OnBubbleHidden();
   EXPECT_EQ(model_->dismissal_reason(),
             password_manager::metrics_util::CLICKED_UNBLACKLIST);
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, model_->state());
   EXPECT_FALSE(controller()->saved_password());
   EXPECT_FALSE(controller()->never_saved_password());
+  EXPECT_TRUE(controller()->unblacklist_site());
 
   histogram_tester.ExpectUniqueSample(
       kUIDismissalReasonMetric,
       password_manager::metrics_util::CLICKED_UNBLACKLIST,
       1);
 }
 
 TEST_F(ManagePasswordsBubbleModelTest, ClickCredential) {
   base::HistogramTester histogram_tester;
   PretendCredentialsWaiting();
@@ skipping 17 matching lines @@
 TEST_F(ManagePasswordsBubbleModelTest, ClickCancelCredential) {
   base::HistogramTester histogram_tester;
   PretendCredentialsWaiting();
   EXPECT_FALSE(controller()->choose_credential());
   model_->OnNopeClicked();
   model_->OnBubbleHidden();
   EXPECT_EQ(model_->dismissal_reason(),
             password_manager::metrics_util::CLICKED_NOPE);
   EXPECT_FALSE(controller()->saved_password());
   EXPECT_FALSE(controller()->never_saved_password());
-  EXPECT_TRUE(controller()->choose_credential());
+  EXPECT_FALSE(controller()->choose_credential());
 
   histogram_tester.ExpectUniqueSample(
       kUIDismissalReasonMetric,
       password_manager::metrics_util::CLICKED_NOPE,
       1);
 }
 
 TEST_F(ManagePasswordsBubbleModelTest, DismissCredential) {
   base::HistogramTester histogram_tester;
   PretendCredentialsWaiting();
   EXPECT_FALSE(controller()->choose_credential());
   model_->OnBubbleHidden();
   EXPECT_EQ(model_->dismissal_reason(),
             password_manager::metrics_util::NO_DIRECT_INTERACTION);
   EXPECT_FALSE(controller()->saved_password());
   EXPECT_FALSE(controller()->never_saved_password());
-  EXPECT_TRUE(controller()->choose_credential());
+  EXPECT_FALSE(controller()->choose_credential());
 
   histogram_tester.ExpectUniqueSample(
       kUIDismissalReasonMetric,
       password_manager::metrics_util::NO_DIRECT_INTERACTION,
       1);
 }
 
 TEST_F(ManagePasswordsBubbleModelTest, PopupAutoSigninToast) {
   base::HistogramTester histogram_tester;
   PretendAutoSigningIn();
   model_->OnAutoSignInToastTimeout();
   model_->OnBubbleHidden();
   EXPECT_EQ(model_->dismissal_reason(),
             password_manager::metrics_util::AUTO_SIGNIN_TOAST_TIMEOUT);
 
   histogram_tester.ExpectUniqueSample(
       kUIDismissalReasonMetric,
       password_manager::metrics_util::AUTO_SIGNIN_TOAST_TIMEOUT,
       1);
 }