Revert 221424 "Save password functionality added to the save pas..."

trunk/src/chrome/browser/password_manager/password_form_manager.cc

Index: trunk/src/chrome/browser/password_manager/password_form_manager.cc
===================================================================
--- trunk/src/chrome/browser/password_manager/password_form_manager.cc	(revision 221694)
+++ trunk/src/chrome/browser/password_manager/password_form_manager.cc	(working copy)
@@ -39,9 +39,7 @@
       web_contents_(web_contents),
       manager_action_(kManagerActionNone),
       user_action_(kUserActionNone),
-      submit_result_(kSubmitResultNotSubmitted),
-      should_save_password_(false),
-      should_blacklist_password_(false) {
+      submit_result_(kSubmitResultNotSubmitted) {
   DCHECK(profile_);
   if (observed_form_.origin.is_valid())
     base::SplitString(observed_form_.origin.path(), '/', &form_path_tokens_);
@@ -52,10 +50,6 @@
   UMA_HISTOGRAM_ENUMERATION("PasswordManager.ActionsTaken",
                             GetActionsTaken(),
                             kMaxNumActionsTaken);
-  // In case the tab is closed before the next navigation occurs this will
-  // apply outstanding changes.
-  if (should_save_password_ || should_blacklist_password_)
-    ApplyChange();
 }
 
 int PasswordFormManager::GetActionsTaken() {
@@ -112,26 +106,6 @@
   return true;
 }
 
-void PasswordFormManager::ApplyChange() {
-  DCHECK(!should_blacklist_password_ || !should_save_password_);
-  if (should_save_password_)
-    Save();
-  else if (should_blacklist_password_)
-    PermanentlyBlacklist();
-  should_blacklist_password_ = false;
-  should_save_password_ = false;
-}
-
-void PasswordFormManager::SavePassword() {
-  should_blacklist_password_ = false;
-  should_save_password_ = true;
-}
-
-void PasswordFormManager::BlacklistPassword() {
-  should_save_password_ = false;
-  should_blacklist_password_ = true;
-}
-
 bool PasswordFormManager::IsBlacklisted() {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
   if (preferred_match_ && preferred_match_->blacklisted_by_user)