Introduce PasswordsModelDelegate as an abstraction between ManagePasswordsBubbleModel and ManagePas…

chrome/browser/password_manager/password_manager_test_base.cc

Index: chrome/browser/password_manager/password_manager_test_base.cc
diff --git a/chrome/browser/password_manager/password_manager_test_base.cc b/chrome/browser/password_manager/password_manager_test_base.cc
index 0a875dec5be1c67540800f42339130a0609a50f2..08cc0017e9ff66deb5e7953a5a7bae40222d1916 100644
--- a/chrome/browser/password_manager/password_manager_test_base.cc
+++ b/chrome/browser/password_manager/password_manager_test_base.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
+#include "chrome/browser/ui/passwords/passwords_model_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
@@ -138,19 +138,19 @@ class InfoBarObserver : public PromptObserver,
 class BubbleObserver : public PromptObserver {
  public:
   explicit BubbleObserver(content::WebContents* web_contents)
-      : ui_controller_(
-            ManagePasswordsUIController::FromWebContents(web_contents)) {}
+      : ui_controller_(PasswordsModelDelegateFromWebContents(web_contents)) {}

[vabr (Chromium), 2015/11/18 08:59:45]

nit: Should the variable name be updated as well, to match the type?

[vasilii, 2015/11/18 12:27:45]

Done.

 
   ~BubbleObserver() override {}
 
  private:
   // PromptObserver:
   bool IsShowingPrompt() const override {
-    return ui_controller_->PasswordPendingUserDecision();
+    return ui_controller_->GetState() ==
+           password_manager::ui::PENDING_PASSWORD_STATE;
   }
 
   bool IsShowingUpdatePrompt() const override {
-    return ui_controller_->state() ==
+    return ui_controller_->GetState() ==
            password_manager::ui::PENDING_PASSWORD_UPDATE_STATE;
   }
 
@@ -164,7 +164,7 @@ class BubbleObserver : public PromptObserver {
     ui_controller_->UpdatePassword(form);
     EXPECT_FALSE(IsShowingUpdatePrompt());
   }
-  ManagePasswordsUIController* const ui_controller_;
+  PasswordsModelDelegate* const ui_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleObserver);
 };