Refactoring Manage Passwords Bubble Code to exclude TabSpecificContentSettings

chrome/browser/password_manager/password_manager.cc

Index: chrome/browser/password_manager/password_manager.cc
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index f2e75a27d2d01f6d80b500a3d1d807c51d7113bb..474b067f895d1ca06e41af4f17eeec55906b02fb 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -11,11 +11,11 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/password_manager/password_manager_delegate.h"
 #include "chrome/browser/password_manager/password_manager_metrics_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/passwords/manage_passwords_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
@@ -340,10 +340,10 @@ void PasswordManager::OnPasswordFormsRendered(
   if (ShouldShowSavePasswordInfoBar()) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableSavePasswordBubble)) {
-      TabSpecificContentSettings* content_settings =
-          TabSpecificContentSettings::FromWebContents(web_contents());
-      if (content_settings) {
-        content_settings->OnPasswordSubmitted(
+      ManagePasswordsController* manage_passwords_controller =
+          ManagePasswordsController::FromWebContents(web_contents());
+      if (manage_passwords_controller) {
+        manage_passwords_controller->OnPasswordSubmitted(
             provisional_save_manager_.release());
       } else {
         provisional_save_manager_.reset();
@@ -429,8 +429,8 @@ void PasswordManager::Autofill(
       break;
   }
 
-  TabSpecificContentSettings* content_settings =
-      TabSpecificContentSettings::FromWebContents(web_contents());
-  if (content_settings)
-    content_settings->OnPasswordAutofilled(best_matches);
+  ManagePasswordsController* manage_passwords_controller =
+      ManagePasswordsController::FromWebContents(web_contents());
+  if (manage_passwords_controller)
+    manage_passwords_controller->OnPasswordAutofilled(best_matches);
 }