[Passwords] Add a const override for GetPasswordFeatureManager()

This CL reverts most of [1] since a const override of
GetPasswordFeatureManager() is actually required and will be used in a
follow CL.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/2030866

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

chrome/browser/password_manager/chrome_password_manager_client.cc

@@ -1326,8 +1326,8 @@ void ChromePasswordManagerClient::FocusedInputChanged(
 #endif  // defined(OS_ANDROID)
 }
 
-password_manager::PasswordFeatureManager*
-ChromePasswordManagerClient::GetPasswordFeatureManager() {
+const password_manager::PasswordFeatureManager*
+ChromePasswordManagerClient::GetPasswordFeatureManager() const {
   return &password_feature_manager_;
 }
 

chrome/browser/password_manager/chrome_password_manager_client.h

@@ -148,8 +148,8 @@ class ChromePasswordManagerClient
   void PromptUserToEnableAutosignin() override;
   bool IsIncognito() const override;
   const password_manager::PasswordManager* GetPasswordManager() const override;
-  password_manager::PasswordFeatureManager* GetPasswordFeatureManager()
-      override;
+  const password_manager::PasswordFeatureManager* GetPasswordFeatureManager()
+      const override;
   password_manager::HttpAuthManager* GetHttpAuthManager() override;
   autofill::AutofillDownloadManager* GetAutofillDownloadManager() override;
   const GURL& GetMainFrameURL() const override;

components/password_manager/core/browser/password_autofill_manager_unittest.cc

@@ -107,7 +107,11 @@ class TestPasswordManagerClient : public StubPasswordManagerClient {
   MockPasswordManagerDriver* mock_driver() { return &driver_; }
   const GURL& GetMainFrameURL() const override { return main_frame_url_; }
 
-  MockPasswordFeatureManager* GetPasswordFeatureManager() override {
+  const MockPasswordFeatureManager* GetPasswordFeatureManager() const override {
+    return feature_manager_.get();
+  }
+
+  MockPasswordFeatureManager* GetPasswordFeatureManager() {
     return feature_manager_.get();
   }
 

components/password_manager/core/browser/password_manager_client.cc

@@ -96,6 +96,17 @@ PasswordManager* PasswordManagerClient::GetPasswordManager() {
       static_cast<const PasswordManagerClient*>(this)->GetPasswordManager());
 }
 
+const PasswordFeatureManager* PasswordManagerClient::GetPasswordFeatureManager()
+    const {
+  return nullptr;
+}
+
+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

@@ -277,7 +277,10 @@ class PasswordManagerClient {
   PasswordManager* GetPasswordManager();
   virtual const PasswordManager* GetPasswordManager() const;
 
-  virtual PasswordFeatureManager* GetPasswordFeatureManager() = 0;
+  // Returns the PasswordFeatureManager associated with this client. The
+  // non-const version calls the const one.
+  PasswordFeatureManager* GetPasswordFeatureManager();
+  virtual const PasswordFeatureManager* GetPasswordFeatureManager() const;
 
   // Returns the HttpAuthManager associated with this client.
   virtual HttpAuthManager* GetHttpAuthManager();

components/password_manager/core/browser/stub_password_manager_client.cc

@@ -86,6 +86,11 @@ const autofill::LogManager* StubPasswordManagerClient::GetLogManager() const {
   return &log_manager_;
 }
 
+const MockPasswordFeatureManager*
+StubPasswordManagerClient::GetPasswordFeatureManager() const {
+  return &password_feature_manager_;
+}
+
 MockPasswordFeatureManager*
 StubPasswordManagerClient::GetPasswordFeatureManager() {
   return &password_feature_manager_;

components/password_manager/core/browser/stub_password_manager_client.h

@@ -59,7 +59,8 @@ class StubPasswordManagerClient : public PasswordManagerClient {
   const GURL& GetLastCommittedEntryURL() const override;
   const CredentialsFilter* GetStoreResultFilter() const override;
   const autofill::LogManager* GetLogManager() const override;
-  MockPasswordFeatureManager* GetPasswordFeatureManager() override;
+  const MockPasswordFeatureManager* GetPasswordFeatureManager() const override;
+  MockPasswordFeatureManager* GetPasswordFeatureManager();
 
 #if defined(ON_FOCUS_PING_ENABLED) || \
     defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)

ios/chrome/browser/passwords/ios_chrome_password_manager_client.h

@@ -109,8 +109,8 @@ class IOSChromePasswordManagerClient
   void PromptUserToEnableAutosignin() override;
   bool IsIncognito() const override;
   const password_manager::PasswordManager* GetPasswordManager() const override;
-  password_manager::PasswordFeatureManager* GetPasswordFeatureManager()
-      override;
+  const password_manager::PasswordFeatureManager* GetPasswordFeatureManager()
+      const override;
   bool IsMainFrameSecure() const override;
   PrefService* GetPrefs() const override;
   password_manager::PasswordStore* GetProfilePasswordStore() const override;

ios/chrome/browser/passwords/ios_chrome_password_manager_client.mm

@@ -153,8 +153,8 @@ IOSChromePasswordManagerClient::GetPasswordManager() const {
   return delegate_.passwordManager;
 }
 
-password_manager::PasswordFeatureManager*
-IOSChromePasswordManagerClient::GetPasswordFeatureManager() {
+const password_manager::PasswordFeatureManager*
+IOSChromePasswordManagerClient::GetPasswordFeatureManager() const {
   return &password_feature_manager_;
 }
 

ios/web_view/internal/passwords/web_view_password_manager_client.h

@@ -89,8 +89,8 @@ class WebViewPasswordManagerClient
   void PromptUserToEnableAutosignin() override;
   bool IsIncognito() const override;
   const password_manager::PasswordManager* GetPasswordManager() const override;
-  password_manager::PasswordFeatureManager* GetPasswordFeatureManager()
-      override;
+  const password_manager::PasswordFeatureManager* GetPasswordFeatureManager()
+      const override;
   bool IsMainFrameSecure() const override;
   PrefService* GetPrefs() const override;
   password_manager::PasswordStore* GetProfilePasswordStore() const override;

ios/web_view/internal/passwords/web_view_password_manager_client.mm

@@ -137,8 +137,8 @@ WebViewPasswordManagerClient::GetPasswordManager() const {
   return delegate_.passwordManager;
 }
 
-password_manager::PasswordFeatureManager*
-WebViewPasswordManagerClient::GetPasswordFeatureManager() {
+const password_manager::PasswordFeatureManager*
+WebViewPasswordManagerClient::GetPasswordFeatureManager() const {
   return &password_feature_manager_;
 }