[Password Manager] Unfriend PasswordAutofillAgentTest from PasswordAutofillAgent (clean-up).

components/autofill/content/renderer/autofill_agent.h

Index: components/autofill/content/renderer/autofill_agent.h
diff --git a/components/autofill/content/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h
index d062c32ca3081bb82b0e5a95a19738dca913a3e2..823ebd48bee1b1e2628bdfe1379d122e45cf42b1 100644
--- a/components/autofill/content/renderer/autofill_agent.h
+++ b/components/autofill/content/renderer/autofill_agent.h
@@ -55,6 +55,29 @@ class AutofillAgent : public content::RenderViewObserver,
                 PasswordGenerationAgent* password_generation_agent);
   virtual ~AutofillAgent();
 
+ protected:
+  // PageClickListener:
+  virtual void FormControlElementClicked(

[vabr (Chromium), 2014/09/15 14:26:59]

No need to expose this, it is already public through PageClickListener.

[Pritam Nikam, 2014/09/16 07:54:20]

AutofillAgent overrides this function. As per current implementation it's kept
under private: accessor.
I've made it protected: so that only derived class - TestAutofillAgent can have
it's accessibility. Hope I didn't misinterpret your comment.

[vabr (Chromium), 2014/09/18 09:29:18]

It should not matter how AutofillAgent changes the visibility -- you can always
upcast the pointer to (in this case) PageClickListener, and call the method.
Because the method is virtual, it will be the AutofillAgent's method, but with
PageClickListener's visibility.

The reason for doing so is to keep the amount of changes, and the size of
TestAutofillAgent, and the need for future updates to the test class at minimum.

If it is still unclear, please let me know.

+      const blink::WebFormControlElement& element,
+      bool was_focused) OVERRIDE;
+
+  // blink::WebAutofillClient:
+  virtual void textFieldDidEndEditing(const blink::WebInputElement& element);

[vabr (Chromium), 2014/09/15 14:26:59]

Also the WebAutofillClient methods are already public through WebAutofillClient,
so no need to expose those.

[Pritam Nikam, 2014/09/16 07:54:20]

Ditto.

+  virtual void textFieldDidChange(const blink::WebFormControlElement& element);
+  virtual void textFieldDidReceiveKeyDown(const blink::WebInputElement& element,
+                                          const blink::WebKeyboardEvent& event);
+  virtual void didRequestAutocomplete(const blink::WebFormElement& form);
+
+  virtual void OnFillPasswordSuggestion(const base::string16& username,
+                                        const base::string16& password);
+
+  // Called when interactive autocomplete finishes. |message| is printed to
+  // the console if non-empty.
+  virtual void OnRequestAutocompleteResult(
+      blink::WebFormElement::AutocompleteResult result,
+      const base::string16& message,
+      const FormData& form_data);
+
  private:
   // content::RenderViewObserver:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
@@ -70,21 +93,7 @@ class AutofillAgent : public content::RenderViewObserver,
   virtual void OrientationChangeEvent() OVERRIDE;
   virtual void Resized() OVERRIDE;
 
-  // PageClickListener:
-  virtual void FormControlElementClicked(
-      const blink::WebFormControlElement& element,
-      bool was_focused) OVERRIDE;
-
   // blink::WebAutofillClient:
-  virtual void textFieldDidEndEditing(
-      const blink::WebInputElement& element);
-  virtual void textFieldDidChange(
-      const blink::WebFormControlElement& element);
-  virtual void textFieldDidReceiveKeyDown(
-      const blink::WebInputElement& element,
-      const blink::WebKeyboardEvent& event);
-  virtual void didRequestAutocomplete(
-      const blink::WebFormElement& form);
   virtual void setIgnoreTextChanges(bool ignore);
   virtual void didAssociateFormControls(
       const blink::WebVector<blink::WebNode>& nodes);
@@ -103,18 +112,9 @@ class AutofillAgent : public content::RenderViewObserver,
   void OnFillFieldWithValue(const base::string16& value);
   void OnPreviewFieldWithValue(const base::string16& value);
   void OnAcceptDataListSuggestion(const base::string16& value);
-  void OnFillPasswordSuggestion(const base::string16& username,
-                                const base::string16& password);
   void OnPreviewPasswordSuggestion(const base::string16& username,
                                    const base::string16& password);
 
-  // Called when interactive autocomplete finishes. |message| is printed to
-  // the console if non-empty.
-  void OnRequestAutocompleteResult(
-      blink::WebFormElement::AutocompleteResult result,
-      const base::string16& message,
-      const FormData& form_data);
-
   // Called when an autocomplete request succeeds or fails with the |result|.
   void FinishAutocompleteRequest(
       blink::WebFormElement::AutocompleteResult result);
@@ -230,25 +230,6 @@ class AutofillAgent : public content::RenderViewObserver,
 
   base::WeakPtrFactory<AutofillAgent> weak_ptr_factory_;
 
-  friend class PasswordAutofillAgentTest;
-  friend class RequestAutocompleteRendererTest;
-  FRIEND_TEST_ALL_PREFIXES(AutofillRendererTest, FillFormElement);
-  FRIEND_TEST_ALL_PREFIXES(AutofillRendererTest, SendDynamicForms);
-  FRIEND_TEST_ALL_PREFIXES(AutofillRendererTest, ShowAutofillWarning);
-  FRIEND_TEST_ALL_PREFIXES(PasswordAutofillAgentTest, WaitUsername);
-  FRIEND_TEST_ALL_PREFIXES(PasswordAutofillAgentTest, SuggestionAccept);
-  FRIEND_TEST_ALL_PREFIXES(PasswordAutofillAgentTest, SuggestionSelect);
-  FRIEND_TEST_ALL_PREFIXES(
-      PasswordAutofillAgentTest,
-      PasswordAutofillTriggersOnChangeEventsWaitForUsername);
-  FRIEND_TEST_ALL_PREFIXES(PasswordAutofillAgentTest, CredentialsOnClick);
-  FRIEND_TEST_ALL_PREFIXES(RequestAutocompleteRendererTest,
-                           NoCancelOnMainFrameNavigateAfterDone);
-  FRIEND_TEST_ALL_PREFIXES(RequestAutocompleteRendererTest,
-                           NoCancelOnSubframeNavigateAfterDone);
-  FRIEND_TEST_ALL_PREFIXES(RequestAutocompleteRendererTest,
-                           InvokingTwiceOnlyShowsOnce);
-
   DISALLOW_COPY_AND_ASSIGN(AutofillAgent);
 };