Clean password_manager::ui::State

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 26 matching lines @@
     new ManagePasswordsUIControllerMock(test_web_contents_.get());
 
     model_.reset(new ManagePasswordsBubbleModel(test_web_contents_.get()));
   }
 
   void TearDown() override { model_.reset(); }
 
   PrefService* prefs() { return profile_.GetPrefs(); }
 
   void PretendNeedToAskUserToSubmitURL() {
-    model_->set_state(password_manager::ui::ASK_USER_REPORT_URL_STATE);
+    model_->set_state(password_manager::ui::
+                      ASK_USER_REPORT_URL_BUBBLE_SHOWN_BEFORE_TRANSITION_STATE);
     EXPECT_FALSE(prefs()->GetBoolean(
         password_manager::prefs::kAllowToCollectURLBubbleWasShown));
     model_->OnBubbleShown(ManagePasswordsBubble::AUTOMATIC);
     EXPECT_TRUE(prefs()->GetBoolean(
         password_manager::prefs::kAllowToCollectURLBubbleWasShown));
     controller()->SetState(
         password_manager::ui::ASK_USER_REPORT_URL_BUBBLE_SHOWN_STATE);
   }
 
   void PretendUserInteractedWithAllowToSubmitBubbleBeforeNavigation() {
     // TODO(melandory) This method should be removed after solution where
     // "Ask to collect URL?" doesn't appear before navigation is implemented.
     model_->OnBubbleShown(ManagePasswordsBubble::AUTOMATIC);
     model_->set_state(
         password_manager::ui::
             ASK_USER_REPORT_URL_BUBBLE_SHOWN_BEFORE_TRANSITION_STATE);
     controller()->SetState(
         password_manager::ui::ASK_USER_REPORT_URL_BUBBLE_SHOWN_STATE);
   }
 
   void PretendPasswordWaiting() {
-    model_->set_state(password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE);
+    model_->set_state(password_manager::ui::PENDING_PASSWORD_STATE);
     model_->OnBubbleShown(ManagePasswordsBubble::AUTOMATIC);
     controller()->SetState(
-        password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE);
+        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 PretendManagingPasswords() {
     model_->set_state(password_manager::ui::MANAGE_STATE);
@@ skipping 50 matching lines @@
           kUIDismissalReasonMetric));
   EXPECT_EQ(NULL, samples.get());
 }
 
 TEST_F(ManagePasswordsBubbleModelTest, CloseWithoutInteraction) {
   base::HistogramTester histogram_tester;
   PretendPasswordWaiting();
   model_->OnBubbleHidden();
   EXPECT_EQ(model_->dismissal_reason(),
             password_manager::metrics_util::NO_DIRECT_INTERACTION);
-  EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE,
+  EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
             model_->state());
   EXPECT_FALSE(controller()->saved_password());
   EXPECT_FALSE(controller()->never_saved_password());
 
   histogram_tester.ExpectUniqueSample(
       kUIDismissalReasonMetric,
       password_manager::metrics_util::NO_DIRECT_INTERACTION,
       1);
 }
 
@@ skipping 240 matching lines @@
             password_manager::metrics_util::NO_DIRECT_INTERACTION);
   EXPECT_FALSE(controller()->saved_password());
   EXPECT_FALSE(controller()->never_saved_password());
   EXPECT_TRUE(controller()->choose_credential());
 
   histogram_tester.ExpectUniqueSample(
       kUIDismissalReasonMetric,
       password_manager::metrics_util::NO_DIRECT_INTERACTION,
       1);
 }
-
-TEST_F(ManagePasswordsBubbleModelTest, PasswordPendingUserDecision) {
-  EXPECT_FALSE(password_manager::ui::IsPendingState(model_->state()));
-
-  model_->set_state(password_manager::ui::INACTIVE_STATE);
-  EXPECT_FALSE(password_manager::ui::IsPendingState(model_->state()));
-  model_->set_state(password_manager::ui::MANAGE_STATE);
-  EXPECT_FALSE(password_manager::ui::IsPendingState(model_->state()));
-  model_->set_state(password_manager::ui::BLACKLIST_STATE);
-  EXPECT_FALSE(password_manager::ui::IsPendingState(model_->state()));
-
-  model_->set_state(password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE);
-  EXPECT_TRUE(password_manager::ui::IsPendingState(model_->state()));
-  model_->set_state(password_manager::ui::PENDING_PASSWORD_STATE);
-  EXPECT_TRUE(password_manager::ui::IsPendingState(model_->state()));
-}