[Passwords] Expose PasswordFeatureManager to the UI

Bug: 1012203
Change-Id: Ia9c8c9c5ff3b1af120490b52ff153313863ebfd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1944470Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720500}

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

@@ -41,6 +41,7 @@
 #include "components/password_manager/core/browser/statistics_table.h"
 #include "components/password_manager/core/common/credential_manager_types.h"
 #include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
@@ -59,7 +60,8 @@ password_manager::PasswordStore* GetPasswordStore(
     content::WebContents* web_contents) {
   return PasswordStoreFactory::GetForProfile(
              Profile::FromBrowserContext(web_contents->GetBrowserContext()),
-             ServiceAccessType::EXPLICIT_ACCESS).get();
+             ServiceAccessType::EXPLICIT_ACCESS)
+      .get();
 }
 
 std::vector<std::unique_ptr<autofill::PasswordForm>> CopyFormVector(
@@ -315,12 +317,19 @@ ManagePasswordsUIController::GetPasswordFormMetricsRecorder() {
   return form_manager ? form_manager->GetMetricsRecorder() : nullptr;
 }
 
+password_manager::PasswordFeatureManager*
+ManagePasswordsUIController::GetPasswordFeatureManager() {
+  password_manager::PasswordManagerClient* client =
+      ChromePasswordManagerClient::FromWebContents(web_contents());
+  return client->GetPasswordFeatureManager();
+}
+
 password_manager::ui::State ManagePasswordsUIController::GetState() const {
   return passwords_data_.state();
 }
 
-const autofill::PasswordForm& ManagePasswordsUIController::
-    GetPendingPassword() const {
+const autofill::PasswordForm& ManagePasswordsUIController::GetPendingPassword()
+    const {
   if (GetState() == password_manager::ui::AUTO_SIGNIN_STATE)
     return *GetCurrentForms()[0];
 

chrome/browser/ui/passwords/manage_passwords_ui_controller.h

@@ -30,8 +30,9 @@ class WebContents;
 namespace password_manager {
 enum class CredentialType;
 struct InteractionsStats;
+class PasswordFeatureManager;
 class PasswordFormManagerForUI;
-}
+}  // namespace password_manager
 
 class AccountChooserPrompt;
 struct AccountInfo;
@@ -110,6 +111,8 @@ class ManagePasswordsUIController
   const GURL& GetOrigin() const override;
   password_manager::PasswordFormMetricsRecorder*
   GetPasswordFormMetricsRecorder() override;
+  password_manager::PasswordFeatureManager* GetPasswordFeatureManager()
+      override;
   password_manager::ui::State GetState() const override;
   const autofill::PasswordForm& GetPendingPassword() const override;
   password_manager::metrics_util::CredentialSourceType GetCredentialSource()
@@ -148,8 +151,7 @@ class ManagePasswordsUIController
 #endif  // defined(UNIT_TEST)
 
  protected:
-  explicit ManagePasswordsUIController(
-      content::WebContents* web_contents);
+  explicit ManagePasswordsUIController(content::WebContents* web_contents);
 
   // Hides the bubble if opened. Mocked in the tests.
   virtual void HidePasswordBubble();

chrome/browser/ui/passwords/passwords_model_delegate.h

@@ -21,6 +21,7 @@ class WebContents;
 }
 namespace password_manager {
 struct InteractionsStats;
+class PasswordFeatureManager;
 class PasswordFormMetricsRecorder;
 namespace metrics_util {
 enum class CredentialSourceType;
@@ -44,6 +45,9 @@ class PasswordsModelDelegate {
   virtual password_manager::PasswordFormMetricsRecorder*
   GetPasswordFormMetricsRecorder() = 0;
 
+  virtual password_manager::PasswordFeatureManager*
+  GetPasswordFeatureManager() = 0;
+
   // Returns the URL of the site the current forms are retrieved for.
   virtual const GURL& GetOrigin() const = 0;
 
@@ -131,7 +135,7 @@ class PasswordsModelDelegate {
   virtual ~PasswordsModelDelegate() = default;
 };
 
-base::WeakPtr<PasswordsModelDelegate>
-PasswordsModelDelegateFromWebContents(content::WebContents* web_contents);
+base::WeakPtr<PasswordsModelDelegate> PasswordsModelDelegateFromWebContents(
+    content::WebContents* web_contents);
 
 #endif  // CHROME_BROWSER_UI_PASSWORDS_PASSWORDS_MODEL_DELEGATE_H_

chrome/browser/ui/passwords/passwords_model_delegate_mock.h

@@ -15,7 +15,7 @@
 
 class PasswordsModelDelegateMock
     : public PasswordsModelDelegate,
-      public base::SupportsWeakPtr<PasswordsModelDelegateMock>{
+      public base::SupportsWeakPtr<PasswordsModelDelegateMock> {
  public:
   PasswordsModelDelegateMock();
   ~PasswordsModelDelegateMock() override;
@@ -23,6 +23,8 @@ class PasswordsModelDelegateMock
   MOCK_CONST_METHOD0(GetWebContents, content::WebContents*());
   MOCK_METHOD0(GetPasswordFormMetricsRecorder,
                password_manager::PasswordFormMetricsRecorder*());
+  MOCK_METHOD0(GetPasswordFeatureManager,
+               password_manager::PasswordFeatureManager*());
   MOCK_CONST_METHOD0(GetOrigin, const GURL&());
   MOCK_CONST_METHOD0(GetState, password_manager::ui::State());
   MOCK_CONST_METHOD0(GetPendingPassword, const autofill::PasswordForm&());
@@ -43,8 +45,9 @@ class PasswordsModelDelegateMock
   MOCK_METHOD0(OnPasswordsRevealed, void());
   MOCK_METHOD2(SavePassword,
                void(const base::string16&, const base::string16&));
-  MOCK_METHOD2(ChooseCredential, void(const autofill::PasswordForm&,
-                                      password_manager::CredentialType));
+  MOCK_METHOD2(ChooseCredential,
+               void(const autofill::PasswordForm&,
+                    password_manager::CredentialType));
   MOCK_METHOD1(NavigateToPasswordManagerAccountDashboard,
                void(password_manager::ManagePasswordsReferrer));
   MOCK_METHOD1(NavigateToPasswordManagerSettingsPage,

components/password_manager/core/browser/password_manager_client.cc

@@ -76,6 +76,12 @@ PasswordManager* PasswordManagerClient::GetPasswordManager() {
       static_cast<const PasswordManagerClient*>(this)->GetPasswordManager());
 }
 
+PasswordFeatureManager* PasswordManagerClient::GetPasswordFeatureManager() {
+  return const_cast<PasswordFeatureManager*>(
+      static_cast<const PasswordManagerClient*>(this)
+          ->GetPasswordFeatureManager());
+}
+
 HttpAuthManager* PasswordManagerClient::GetHttpAuthManager() {
   return nullptr;
 }

components/password_manager/core/browser/password_manager_client.h

@@ -250,6 +250,7 @@ class PasswordManagerClient {
   PasswordManager* GetPasswordManager();
   virtual const PasswordManager* GetPasswordManager() const;
 
+  PasswordFeatureManager* GetPasswordFeatureManager();
   virtual const PasswordFeatureManager* GetPasswordFeatureManager() const = 0;
 
   // Returns the HttpAuthManager associated with this client.