Refactoring Manage Passwords Bubble Code to exclude TabSpecificContentSettings

chrome/browser/content_settings/tab_specific_content_settings.h

Index: chrome/browser/content_settings/tab_specific_content_settings.h
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h
index 0f871934eb9b98c438b7dcd279cdd91140efc05d..8671e53b7be0772ec8118ced4182269424f59396 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.h
+++ b/chrome/browser/content_settings/tab_specific_content_settings.h
@@ -15,7 +15,6 @@
 #include "chrome/browser/content_settings/content_settings_usages_state.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/media/media_stream_devices_controller.h"
-#include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
@@ -56,31 +55,6 @@ class TabSpecificContentSettings
     MICROPHONE_CAMERA_BLOCKED,
   };
 
-  // A PasswordObserver is implemented in ManagePasswordsIconController which
-  // will be notified when a password form is submitted.
-  class PasswordObserver {
-   public:
-    explicit PasswordObserver(
-        TabSpecificContentSettings* tab_specific_content_settings);
-    virtual ~PasswordObserver();
-
-    // Called whenever a password form is submitted.
-    virtual void OnPasswordAction() = 0;
-
-    TabSpecificContentSettings* tab_specific_content_settings() {
-      return tab_specific_content_settings_;
-    }
-
-    // Called when the TabSpecificContentSettings is destroyed; nulls out
-    // the local reference.
-    void ContentSettingsDestroyed();
-
-   private:
-    TabSpecificContentSettings* tab_specific_content_settings_;
-
-    DISALLOW_COPY_AND_ASSIGN(PasswordObserver);
-  };
-
   // Classes that want to be notified about site data events must implement
   // this abstract class and add themselves as observer to the
   // |TabSpecificContentSettings|.
@@ -231,32 +205,6 @@ class TabSpecificContentSettings
   // Returns the state of the camera and microphone usage.
   MicrophoneCameraState GetMicrophoneCameraState() const;
 
-  void unset_manage_passwords_bubble_needs_showing() {
-    manage_passwords_bubble_needs_showing_ = false;
-  }
-
-  bool password_to_be_saved() const {
-    return password_to_be_saved_;
-  }
-
-  void unset_password_to_be_saved() {
-    password_to_be_saved_ = false;
-  }
-
-  bool manage_passwords_bubble_needs_showing() const {
-    return manage_passwords_bubble_needs_showing_;
-  }
-
-  bool manage_passwords_icon_to_be_shown() const {
-    return manage_passwords_icon_to_be_shown_;
-  }
-
-  // Returns whether there is a password to be saved.
-  bool GetPasswordSavingState() const;
-
-  // Returns whether the password bubble has been shown to the user.
-  bool GetManagePasswordsBubbleShownState() const;
-
   const std::set<std::string>& BlockedResourcesForType(
       ContentSettingsType content_type) const;
 
@@ -345,33 +293,6 @@ class TabSpecificContentSettings
   virtual void AppCacheAccessed(const GURL& manifest_url,
                                 bool blocked_by_policy) OVERRIDE;
 
-  void SavePassword();
-
-  const autofill::PasswordForm pending_credentials() const {
-    return form_manager_->pending_credentials();
-  }
-
-  const autofill::PasswordFormMap best_matches() const {
-    return password_form_map_;
-  }
-
-  // TODO(npentrel) This ought to be changed. Best matches should be newly
-  // made when opening the ManagePasswordsBubble because there may have been
-  // changes to the best matches via the settings page. At the moment this also
-  // fails if one deletes a password when they are autofilled, as it still shows
-  // up after logging in and saving a password.
-  void remove_from_best_matches(autofill::PasswordForm password_form) {
-    password_form_map_.erase(password_form.username_value);
-  }
-
-  bool password_submitted() const {
-    return password_submitted_;
-  }
-
-  void password_submitted(bool password_submitted) {
-    password_submitted_ = password_submitted;
-  }
-
   // Message handlers. Public for testing.
   void OnContentBlocked(ContentSettingsType type,
                         const std::string& resource_identifier);
@@ -415,25 +336,10 @@ class TabSpecificContentSettings
       const MediaStreamDevicesController::MediaStreamTypeSettingsMap&
           request_permissions);
 
-  // Called when the user submits a form containing login information, so we
-  // can handle later requests to save or blacklist that login information.
-  // This stores the provided object in form_manager_ and triggers the UI to
-  // prompt the user about whether they would like to save the password.
-  void OnPasswordSubmitted(PasswordFormManager* form_manager);
-
-  // Called when a form is autofilled with login information, so we can manage
-  // password credentials for the current site which are stored in
-  // |password_form_map|. This stores a copy of |password_form_map| and shows
-  // the manage password icon.
-  void OnPasswordAutofilled(const autofill::PasswordFormMap& password_form_map);
-
   // There methods are called to update the status about MIDI access.
   void OnMIDISysExAccessed(const GURL& reqesting_origin);
   void OnMIDISysExAccessBlocked(const GURL& requesting_origin);
 
-  // Is called to set ManagePasswordsIconController as an observer.
-  void SetPasswordObserver(PasswordObserver* observer);
-
   // Adds the given |SiteDataObserver|. The |observer| is notified when a
   // locale shared object, like for example a cookie, is accessed.
   void AddSiteDataObserver(SiteDataObserver* observer);
@@ -453,12 +359,6 @@ class TabSpecificContentSettings
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // Notifies the registered PasswordObserver of a sumitted password form.
-  void NotifyPasswordObserver();
-
-  // Currently the registered PasswordObserver.
-  PasswordObserver* password_observer_;
-
   // Notifies all registered |SiteDataObserver|s.
   void NotifySiteDataObservers();
 
@@ -522,21 +422,6 @@ class TabSpecificContentSettings
   std::string media_stream_requested_audio_device_;
   std::string media_stream_requested_video_device_;
 
-  // Set by OnPasswordSubmitted() when the user submits a form containing login
-  // information.  If the user responds to a subsequent "Do you want to save
-  // this password?" prompt, we ask this object to save or blacklist the
-  // associated login information in Chrome's password store.
-  scoped_ptr<PasswordFormManager> form_manager_;
-
-  // All previously stored credentials for a specific site.  Set by
-  // OnPasswordSubmitted() or OnPasswordAutofilled().
-  autofill::PasswordFormMap password_form_map_;
-
-  bool manage_passwords_icon_to_be_shown_;
-  bool password_to_be_saved_;
-  bool manage_passwords_bubble_needs_showing_;
-  bool password_submitted_;
-
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };