Refactor PasswordAutofillAgent: methods to functions.

components/autofill/content/renderer/password_autofill_agent.h

Index: components/autofill/content/renderer/password_autofill_agent.h
diff --git a/components/autofill/content/renderer/password_autofill_agent.h b/components/autofill/content/renderer/password_autofill_agent.h
index daeb291eeb71681e069426c35efaf811488b8f32..afd9c597c3672fe773d50bb11859ceabb516c267 100644
--- a/components/autofill/content/renderer/password_autofill_agent.h
+++ b/components/autofill/content/renderer/password_autofill_agent.h
@@ -27,6 +27,14 @@ namespace autofill {
 // There is one PasswordAutofillAgent per RenderView.
 class PasswordAutofillAgent : public content::RenderViewObserver {
  public:
+  enum OtherPossibleUsernamesUsage {

[vabr (Chromium), 2014/09/26 10:06:48]

Please keep this private, not public.

Instead, use the return value of the 3 moved functions to indicate whether or
not other possible usernames were shown/selected. Also please document that
meaning of the return value.

+    NOTHING_TO_AUTOFILL,
+    OTHER_POSSIBLE_USERNAMES_ABSENT,
+    OTHER_POSSIBLE_USERNAMES_PRESENT,
+    OTHER_POSSIBLE_USERNAME_SHOWN,
+    OTHER_POSSIBLE_USERNAME_SELECTED,
+    OTHER_POSSIBLE_USERNAMES_MAX
+  };
   explicit PasswordAutofillAgent(content::RenderView* render_view);
   virtual ~PasswordAutofillAgent();
 
@@ -73,15 +81,6 @@ class PasswordAutofillAgent : public content::RenderViewObserver {
       const blink::WebSecurityOrigin& origin);
 
  private:
-  enum OtherPossibleUsernamesUsage {
-    NOTHING_TO_AUTOFILL,
-    OTHER_POSSIBLE_USERNAMES_ABSENT,
-    OTHER_POSSIBLE_USERNAMES_PRESENT,
-    OTHER_POSSIBLE_USERNAME_SHOWN,
-    OTHER_POSSIBLE_USERNAME_SELECTED,
-    OTHER_POSSIBLE_USERNAMES_MAX
-  };
-
   // Ways to restrict which passwords are saved in ProvisionallySavePassword.
   enum ProvisionallySaveRestriction {
     RESTRICTION_NONE,
@@ -153,30 +152,10 @@ class PasswordAutofillAgent : public content::RenderViewObserver {
   // If |only_visible| is true, only forms visible in the layout are sent.
   void SendPasswordForms(blink::WebFrame* frame, bool only_visible);
 
-  void GetSuggestions(const PasswordFormFillData& fill_data,
-                      const base::string16& input,
-                      std::vector<base::string16>* suggestions,
-                      std::vector<base::string16>* realms,
-                      bool show_all);
-
   bool ShowSuggestionPopup(const PasswordFormFillData& fill_data,
                            const blink::WebInputElement& user_input,
                            bool show_all);
 
-  // Attempts to fill |username_element| and |password_element| with the
-  // |fill_data|.  Will use the data corresponding to the preferred username,
-  // unless the |username_element| already has a value set.  In that case,
-  // attempts to fill the password matching the already filled username, if
-  // such a password exists.
-  void FillFormOnPasswordRecieved(const PasswordFormFillData& fill_data,
-                                  blink::WebInputElement username_element,
-                                  blink::WebInputElement password_element);
-
-  bool FillUserNameAndPassword(blink::WebInputElement* username_element,
-                               blink::WebInputElement* password_element,
-                               const PasswordFormFillData& fill_data,
-                               bool exact_username_match,
-                               bool set_selection);
 
   // Fills |login_input| and |password| with the most relevant suggestion from
   // |fill_data| and shows a popup with other suggestions.