Switch components/password_manager code from IPC messages to Mojo.

components/password_manager/content/browser/credential_manager_impl.h

 // Copyright 2014 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_PASSWORD_MANAGER_CONTENT_BROWSER_CONTENT_CREDENTIAL_MANAGER_DISPATCHER_H_
-#define COMPONENTS_PASSWORD_MANAGER_CONTENT_BROWSER_CONTENT_CREDENTIAL_MANAGER_DISPATCHER_H_
+#ifndef COMPONENTS_PASSWORD_MANAGER_CONTENT_BROWSER_CONTENT_CREDENTIAL_MANAGER_IMPL_H_
+#define COMPONENTS_PASSWORD_MANAGER_CONTENT_BROWSER_CONTENT_CREDENTIAL_MANAGER_IMPL_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "components/password_manager/content/public/interfaces/credential_manager.mojom.h"
 #include "components/password_manager/core/browser/credential_manager_password_form_manager.h"
 #include "components/password_manager/core/browser/credential_manager_pending_request_task.h"
 #include "components/password_manager/core/browser/credential_manager_pending_require_user_mediation_task.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 #include "components/prefs/pref_member.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
 
 class GURL;
 
 namespace autofill {
 struct PasswordForm;
 }
 
 namespace content {
 class WebContents;
 }
 
 namespace password_manager {
 class CredentialManagerPasswordFormManager;
 class PasswordManagerClient;
 class PasswordManagerDriver;
 class PasswordStore;
 struct CredentialInfo;
 
-class CredentialManagerDispatcher
-    : public content::WebContentsObserver,
+// This class implements the Mojo interface mojom::CredentialManager.

[vabr (Chromium), 2016/03/09 16:26:29]

optional: Drop this comment, line 40 says the same thing.

[leonhsl(Using Gerrit), 2016/03/10 06:42:41]

Done.

+class CredentialManagerImpl
+    : public mojom::CredentialManager,
+      public content::WebContentsObserver,
       public CredentialManagerPasswordFormManagerDelegate,
       public CredentialManagerPendingRequestTaskDelegate,
       public CredentialManagerPendingRequireUserMediationTaskDelegate {
  public:
-  CredentialManagerDispatcher(content::WebContents* web_contents,
-                              PasswordManagerClient* client);
-  ~CredentialManagerDispatcher() override;
+  CredentialManagerImpl(content::WebContents* web_contents,
+                        PasswordManagerClient* client);
+  ~CredentialManagerImpl() override;
 
-  // Called in response to an IPC from the renderer, triggered by a page's call
-  // to 'navigator.credentials.store'.
-  virtual void OnStore(int request_id, const password_manager::CredentialInfo&);
-
-  // Called in response to an IPC from the renderer, triggered by a page's call
-  // to 'navigator.credentials.requireUserMediation'.
-  virtual void OnRequireUserMediation(int request_id);
-
-  // Called in response to an IPC from the renderer, triggered by a page's call
-  // to 'navigator.credentials.request'.
-  //
-  // TODO(vabr): Determine if we can drop the `const` here to save some copies
-  // while processing the request.
-  virtual void OnRequestCredential(int request_id,
-                                   bool zero_click_only,
-                                   bool include_passwords,
-                                   const std::vector<GURL>& federations);
-
-  // content::WebContentsObserver implementation.
-  bool OnMessageReceived(const IPC::Message& message) override;
+  void BindRequest(mojom::CredentialManagerRequest request);
 
   // CredentialManagerPendingRequestTaskDelegate:
   bool IsZeroClickAllowed() const override;
   GURL GetOrigin() const override;
-  void SendCredential(int request_id, const CredentialInfo& info) override;
+  void SendCredential(const SendCredentialCallback& send_callback,
+                      const CredentialInfo& info) override;
   PasswordManagerClient* client() const override;
   autofill::PasswordForm GetSynthesizedFormForOrigin() const override;
 
   // CredentialManagerPendingSignedOutTaskDelegate:
   PasswordStore* GetPasswordStore() override;
   void DoneRequiringUserMediation() override;
 
   // CredentialManagerPasswordFormManagerDelegate:
   void OnProvisionalSaveComplete() override;
 
  private:
+  // mojom::CredentialManager methods:
+  // Called in response to the request from the renderer, triggered by a page's

[vabr (Chromium), 2016/03/09 16:26:29]

nit: Actually, the comments explaining the methods should be removed, they
should only be present in the interface definition. Having a single source of
them avoids diverging in the future.

[leonhsl(Using Gerrit), 2016/03/10 06:42:41]

Done. Only leave comments in the interface definition.

+  // call

[vabr (Chromium), 2016/03/09 16:26:29]

nit: Please indent the comment block properly, do not leave unnecessary
horizontal space. You can, e.g., put the whole comment on one line and let git
cl format break it for you.

Also below.

[leonhsl(Using Gerrit), 2016/03/10 06:42:41]

Done.

+  // to 'navigator.credentials.store'.
+  void Store(mojom::CredentialInfoPtr credential,
+             const StoreCallback& callback) override;
+
+  // Called in response to the request from the renderer, triggered by a page's
+  // call
+  // to 'navigator.credentials.requireUserMediation'.
+  void RequireUserMediation(
+      const RequireUserMediationCallback& callback) override;
+
+  // Called in response to the request from the renderer, triggered by a page's
+  // call
+  // to 'navigator.credentials.request'.

[vabr (Chromium), 2016/03/09 16:26:29]

"request" or "get"? The mojom file says "get". The method name should match the
API call name.

[leonhsl(Using Gerrit), 2016/03/10 06:42:41]

Done. It should be 'navigator.credentials.get()'.

+  void Get(bool zero_click_only,
+           bool include_passwords,
+           mojo::Array<mojo::String> federations,
+           const GetCallback& callback) override;
+
   // Returns the driver for the current main frame.
   // Virtual for testing.
   virtual base::WeakPtr<PasswordManagerDriver> GetDriver();
 
   // Schedules a CredentiaManagerPendingRequestTask (during
   // |OnRequestCredential()|) after the PasswordStore's AffiliationMatchHelper
   // grabs a list of realms related to the current web origin.
-  void ScheduleRequestTask(int request_id,
+  void ScheduleRequestTask(const GetCallback& callback,
                            bool zero_click_only,
                            bool include_passwords,
                            const std::vector<GURL>& federations,
                            const std::vector<std::string>& android_realms);
 
   // Schedules a CredentialManagerPendingRequireUserMediationTask after the
   // AffiliationMatchHelper grabs a list of realms related to the current
   // web origin.
   void ScheduleRequireMediationTask(
-      int request_id,
+      const RequireUserMediationCallback& callback,
       const std::vector<std::string>& android_realms);
 
   // Returns true iff it's OK to update credentials in the password store.
   bool IsUpdatingCredentialAllowed() const;
 
   PasswordManagerClient* client_;
   scoped_ptr<CredentialManagerPasswordFormManager> form_manager_;
 
   // Set to false to disable automatic signing in.
   BooleanPrefMember auto_signin_enabled_;
 
   // When 'OnRequestCredential' is called, it in turn calls out to the
   // PasswordStore; we push enough data into Pending*Task objects so that
   // they can properly respond to the request once the PasswordStore gives
   // us data.
   scoped_ptr<CredentialManagerPendingRequestTask> pending_request_;
   scoped_ptr<CredentialManagerPendingRequireUserMediationTask>
       pending_require_user_mediation_;
 
-  base::WeakPtrFactory<CredentialManagerDispatcher> weak_factory_;
+  mojo::BindingSet<mojom::CredentialManager> bindings_;
 
-  DISALLOW_COPY_AND_ASSIGN(CredentialManagerDispatcher);
+  base::WeakPtrFactory<CredentialManagerImpl> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(CredentialManagerImpl);
 };
 
 }  // namespace password_manager
 
-#endif  // COMPONENTS_PASSWORD_MANAGER_CONTENT_BROWSER_CONTENT_CREDENTIAL_MANAGER_DISPATCHER_H_
+#endif  // COMPONENTS_PASSWORD_MANAGER_CONTENT_BROWSER_CONTENT_CREDENTIAL_MANAGER_IMPL_H_