[password autofill] Remove references to PasswordForm from RenderViewImpl

chrome/browser/password_manager/password_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_
 
 #include <vector>
 
+#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_member.h"
 #include "base/stl_util.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/ui/login/login_model.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ skipping 15 matching lines @@
                         public content::WebContentsObserver,
                         public content::WebContentsUserData<PasswordManager> {
  public:
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   static void CreateForWebContentsAndDelegate(
       content::WebContents* contents,
       PasswordManagerDelegate* delegate);
   virtual ~PasswordManager();
 
+  typedef base::Callback<void(const content::PasswordForm&)>
+  PasswordSubmittedCallback;

[Ilya Sherman, 2013/07/27 01:09:48]

nit: Please indent four more spaces.

[Garrett Casto, 2013/08/03 00:38:42]

Done.

+
+  // There is no corresponding remove function as currently all of the
+  // owners of these callbacks have the same lifetime as the PasswordManager.

[Ilya Sherman, 2013/07/27 01:09:48]

That's not entirely accurate -- there is some ordering to the destruction of
objects dangling off a WebContents.  But that's really more to the point of
whether base::Unretained() is safe to use or not.

[Garrett Casto, 2013/08/03 00:38:42]

I tried to clear this comment up a bit. Not sure if this is clearer or not.

+  void AddSubmissionCallback(const PasswordSubmittedCallback& callback);

[Ilya Sherman, 2013/07/27 01:09:48]

Could you add some test coverage for these callbacks?

[Garrett Casto, 2013/08/03 00:38:42]

Done.

+
   // Is saving new data for password autofill enabled for the current profile?
   // For example, saving new data is disabled in Incognito mode, whereas filling
   // data is not.
   bool IsSavingEnabled() const;
 
   // Called by a PasswordFormManager when it decides a form can be autofilled
   // on the page.
   virtual void Autofill(const content::PasswordForm& form_for_autofill,
                         const content::PasswordFormMap& best_matches,
                         const content::PasswordForm& preferred_match,
                         bool wait_for_username) const;
 
   // LoginModel implementation.
   virtual void AddObserver(LoginModelObserver* observer) OVERRIDE;
   virtual void RemoveObserver(LoginModelObserver* observer) OVERRIDE;
 
   // Mark this form as having a generated password.
   void SetFormHasGeneratedPassword(const content::PasswordForm& form);
 
   // TODO(isherman): This should not be public, but is currently being used by
   // the LoginPrompt code.
   // When a form is submitted, we prepare to save the password but wait
   // until we decide the user has successfully logged in. This is step 1
   // of 2 (see SavePassword).
   void ProvisionallySavePassword(const content::PasswordForm& form);
 
   // content::WebContentsObserver overrides.
-  virtual void DidNavigateAnyFrame(
+  virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // TODO(isherman): This should not be public, but is currently being used by
   // the LoginPrompt code.
   void OnPasswordFormsParsed(
       const std::vector<content::PasswordForm>& forms);
   void OnPasswordFormsRendered(
       const std::vector<content::PasswordForm>& visible_forms);
 
  protected:
   // Subclassed for unit tests.
   PasswordManager(content::WebContents* web_contents,
                   PasswordManagerDelegate* delegate);
 
  private:
   friend class content::WebContentsUserData<PasswordManager>;
+  friend class PasswordManagerTest;

[Ilya Sherman, 2013/07/27 01:09:48]

Rather than friending the test class -- which allows the class to muck with
*all* of the private state for this object, please just make
OnPasswordFormSubmitted have protected visibility, and create a subclass for
testing that ups the visibility to public.

[Garrett Casto, 2013/08/03 00:38:42]

As you wish. I personally don't have a problem with this for testing code.

+
+  // Handle notification that a password form was submitted.
+  void OnPasswordFormSubmitted(const content::PasswordForm& password_form);
 
   // Possibly set up FieldTrial for testing other possible usernames. This only
   // happens if there are other_possible_usernames to be shown and the
   // experiment hasn't already been initialized. We setup the experiment at
   // such a late time because this experiment will only affect a small number
   // of users so we want to include a larger fraction of these users than the
   // normal 10%.
   void PossiblyInitializeUsernamesExperiment(
       const content::PasswordFormMap& matches) const;
 
@@ skipping 26 matching lines @@
   // attempt to have succeeded (as in valid credentials). If it fails, we
   // send the PasswordFormManager back to the pending_login_managers_ set.
   // Scoped in case PasswordManager gets deleted (e.g tab closes) between the
   // time a user submits a login form and gets to the next page.
   scoped_ptr<PasswordFormManager> provisional_save_manager_;
 
   // Our delegate for carrying out external operations.  This is typically the
   // containing WebContents.
   PasswordManagerDelegate* const delegate_;
 
-  // The LoginModelObserver (i.e LoginView) requiring autofill.
-  LoginModelObserver* observer_;
-
   // Set to false to disable the password manager (will no longer ask if you
   // want to save passwords but will continue to fill passwords).
   BooleanPrefMember password_manager_enabled_;
 
   // Observers to be notified of LoginModel events.  This is mutable to allow
   // notification in const member functions.
   mutable ObserverList<LoginModelObserver> observers_;
 
+  // Callbacks to be notified when a password form has been submitted.
+  std::vector<PasswordSubmittedCallback> submission_callbacks_;
+
   DISALLOW_COPY_AND_ASSIGN(PasswordManager);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_