Revert "Password bubble: Add an "active" icon state, and a new disabled icon."

chrome/browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc

Index: chrome/browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc b/chrome/browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc
index 92df8c7cd9577e5cae1e80af0bb43dfa911bbe51..9f1331c87f14eeb1f2a60a291f18826d7967c985 100644
--- a/chrome/browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc
+++ b/chrome/browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc
@@ -19,44 +19,28 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsIconViewTest, DefaultStateIsInactive) {
   EXPECT_FALSE(view()->visible());
   EXPECT_EQ(0, view()->icon_id());
   EXPECT_EQ(0, view()->tooltip_text_id());
-  view()->SetActive(true);
-  EXPECT_EQ(0, view()->icon_id());
-  view()->SetActive(false);
-  EXPECT_EQ(0, view()->icon_id());
 }
 
 IN_PROC_BROWSER_TEST_F(ManagePasswordsIconViewTest, PendingState) {
   SetupPendingPassword();
   EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE, view()->state());
   EXPECT_TRUE(view()->visible());
-  EXPECT_EQ(IDR_SAVE_PASSWORD_INACTIVE, view()->icon_id());
+  EXPECT_EQ(IDR_SAVE_PASSWORD, view()->icon_id());
   EXPECT_EQ(IDS_PASSWORD_MANAGER_TOOLTIP_SAVE, view()->tooltip_text_id());
-  view()->SetActive(true);
-  EXPECT_EQ(IDR_SAVE_PASSWORD_ACTIVE, view()->icon_id());
-  view()->SetActive(false);
-  EXPECT_EQ(IDR_SAVE_PASSWORD_INACTIVE, view()->icon_id());
 }
 
 IN_PROC_BROWSER_TEST_F(ManagePasswordsIconViewTest, ManageState) {
   SetupManagingPasswords();
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, view()->state());
   EXPECT_TRUE(view()->visible());
-  EXPECT_EQ(IDR_SAVE_PASSWORD_INACTIVE, view()->icon_id());
+  EXPECT_EQ(IDR_SAVE_PASSWORD, view()->icon_id());
   EXPECT_EQ(IDS_PASSWORD_MANAGER_TOOLTIP_MANAGE, view()->tooltip_text_id());
-  view()->SetActive(true);
-  EXPECT_EQ(IDR_SAVE_PASSWORD_ACTIVE, view()->icon_id());
-  view()->SetActive(false);
-  EXPECT_EQ(IDR_SAVE_PASSWORD_INACTIVE, view()->icon_id());
 }
 
 IN_PROC_BROWSER_TEST_F(ManagePasswordsIconViewTest, BlacklistedState) {
   SetupBlackistedPassword();
   EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, view()->state());
   EXPECT_TRUE(view()->visible());
-  EXPECT_EQ(IDR_SAVE_PASSWORD_DISABLED_INACTIVE, view()->icon_id());
+  EXPECT_EQ(IDR_SAVE_PASSWORD_BLACKLISTED, view()->icon_id());
   EXPECT_EQ(IDS_PASSWORD_MANAGER_TOOLTIP_MANAGE, view()->tooltip_text_id());
-  view()->SetActive(true);
-  EXPECT_EQ(IDR_SAVE_PASSWORD_DISABLED_ACTIVE, view()->icon_id());
-  view()->SetActive(false);
-  EXPECT_EQ(IDR_SAVE_PASSWORD_DISABLED_INACTIVE, view()->icon_id());
 }