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

components/autofill/content/renderer/autofill_agent.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_
 #define COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 37 matching lines @@
                       public blink::WebAutofillClient {
  public:
   // PasswordAutofillAgent is guaranteed to outlive AutofillAgent.
   // PasswordGenerationAgent may be NULL. If it is not, then it is also
   // guaranteed to outlive AutofillAgent.
   AutofillAgent(content::RenderView* render_view,
                 PasswordAutofillAgent* password_autofill_manager,
                 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;
   virtual void DidFinishDocumentLoad(blink::WebLocalFrame* frame) OVERRIDE;
   virtual void DidCommitProvisionalLoad(blink::WebLocalFrame* frame,
                                         bool is_new_navigation) OVERRIDE;
   virtual void FrameDetached(blink::WebFrame* frame) OVERRIDE;
   virtual void FrameWillClose(blink::WebFrame* frame) OVERRIDE;
   virtual void WillSubmitForm(blink::WebLocalFrame* frame,
                               const blink::WebFormElement& form) OVERRIDE;
   virtual void DidChangeScrollOffset(blink::WebLocalFrame* frame) OVERRIDE;
   virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE;
   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);
   virtual void openTextDataListChooser(const blink::WebInputElement& element);
   virtual void firstUserGestureObserved();
 
   void OnFieldTypePredictionsAvailable(
       const std::vector<FormDataPredictions>& forms);
   void OnFillForm(int query_id, const FormData& form);
   void OnPing();
   void OnPreviewForm(int query_id, const FormData& form);
 
   // For external Autofill selection.
   void OnClearForm();
   void OnClearPreviewedForm();
   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);
 
   // Called in a posted task by textFieldDidChange() to work-around a WebKit bug
   // http://bugs.webkit.org/show_bug.cgi?id=16976
   void TextFieldDidChangeImpl(const blink::WebFormControlElement& element);
 
   // Shows the autofill suggestions for |element|.
   // This call is asynchronous and may or may not lead to the showing of a
@@ skipping 95 matching lines @@
   // messages to close the Autofill popup when it can't possibly be showing.
   bool is_popup_possibly_visible_;
 
   // True if a message has already been sent about forms for the main frame.
   // When the main frame is first loaded, a message is sent even if no forms
   // exist in the frame. Otherwise, such messages are supressed.
   bool main_frame_processed_;
 
   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);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_