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

chrome/browser/ui/passwords/manage_passwords_ui_controller.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 "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
@@ skipping 91 matching lines @@
   for (password_manager::PasswordStoreChangeList::const_iterator it =
            changes.begin();
        it != changes.end();
        it++) {
     const autofill::PasswordForm& changed_form = it->form();
     if (changed_form.origin != origin_)
       continue;
 
     if (it->type() == password_manager::PasswordStoreChange::REMOVE) {
       password_form_map_.erase(changed_form.username_value);
-      if (changed_form.blacklisted_by_user)
+      if (changed_form.blacklisted_by_user) {
+        DCHECK(state_ == password_manager::ui::BLACKLIST_STATE);
         state_ = password_manager::ui::MANAGE_STATE;
+      }
     } else {
       new_password_forms_.push_back(new autofill::PasswordForm(changed_form));
       password_form_map_[changed_form.username_value] =
           new_password_forms_.back();
       if (changed_form.blacklisted_by_user)
         state_ = password_manager::ui::BLACKLIST_STATE;
     }
   }
   if (current_state != state_)
     UpdateBubbleAndIconVisibility();
@@ skipping 84 matching lines @@
     return;
   CommandUpdater* updater = browser->command_controller()->command_updater();
   updater->ExecuteCommand(IDC_MANAGE_PASSWORDS_FOR_PAGE);
 #endif
 }
 
 bool ManagePasswordsUIController::PasswordPendingUserDecision() const {
   return state_ == password_manager::ui::PENDING_PASSWORD_STATE ||
          state_ == password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE;
 }