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

trunk/src/chrome/browser/content_settings/tab_specific_content_settings.cc

 // Copyright (c) 2012 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/content_settings/tab_specific_content_settings.h"
 
 #include <list>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 81 matching lines @@
   registrar_.Add(this, chrome::NOTIFICATION_CONTENT_SETTINGS_CHANGED,
                  content::Source<HostContentSettingsMap>(
                      profile_->GetHostContentSettingsMap()));
 }
 
 TabSpecificContentSettings::~TabSpecificContentSettings() {
   FOR_EACH_OBSERVER(
       SiteDataObserver, observer_list_, ContentSettingsDestroyed());
 }
 
-bool TabSpecificContentSettings::PasswordAccepted() {
-  DCHECK(form_to_save_.get());
-  form_to_save_->SavePassword();
-  return true;
-}
-
-bool TabSpecificContentSettings::PasswordFormBlacklisted() {
-  DCHECK(form_to_save_.get());
-  form_to_save_->BlacklistPassword();
-  return true;
-}
-
 TabSpecificContentSettings* TabSpecificContentSettings::Get(
     int render_process_id, int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   RenderViewHost* view = RenderViewHost::FromID(render_process_id,
                                                 render_view_id);
   if (!view)
     return NULL;
 
   WebContents* web_contents = WebContents::FromRenderViewHost(view);
@@ skipping 344 matching lines @@
 void TabSpecificContentSettings::OnGeolocationPermissionSet(
     const GURL& requesting_origin,
     bool allowed) {
   geolocation_usages_state_.OnPermissionSet(requesting_origin, allowed);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED,
       content::Source<WebContents>(web_contents()),
       content::NotificationService::NoDetails());
 }
 
+// TODO(npentrel): Save the password when user accepts the prompt
 void TabSpecificContentSettings::OnPasswordSubmitted(
       PasswordFormManager* form_to_save) {
-  form_to_save_.reset(form_to_save);
   OnContentAllowed(CONTENT_SETTINGS_TYPE_SAVE_PASSWORD);
   NotifySiteDataObservers();
 }
 
 TabSpecificContentSettings::PasswordSavingState
 TabSpecificContentSettings::GetPasswordSavingState() const {
   if (IsContentAllowed(CONTENT_SETTINGS_TYPE_SAVE_PASSWORD))
     return PASSWORD_TO_BE_SAVED;
   else
     return NO_PASSWORD_TO_BE_SAVED;
@@ skipping 161 matching lines @@
   IPC_BEGIN_MESSAGE_MAP(TabSpecificContentSettings, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ContentBlocked, OnContentBlocked)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void TabSpecificContentSettings::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
-  if (form_to_save_)
-    form_to_save_->ApplyChange();
   if (!details.is_in_page) {
     // Clear "blocked" flags.
     ClearBlockedContentSettingsExceptForCookies();
     GeolocationDidNavigate(details);
     MIDIDidNavigate(details);
   }
 }
 
 void TabSpecificContentSettings::DidStartProvisionalLoadForFrame(
     int64 frame_id,
@@ skipping 57 matching lines @@
 }
 
 void TabSpecificContentSettings::RemoveSiteDataObserver(
     SiteDataObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void TabSpecificContentSettings::NotifySiteDataObservers() {
   FOR_EACH_OBSERVER(SiteDataObserver, observer_list_, OnSiteDataAccessed());
 }