Introduce PasswordsModelDelegate as an abstraction between ManagePasswordsBubbleModel and ManagePas…

chrome/browser/password_manager/password_manager_test_base.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/password_manager/password_manager_test_base.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #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"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_manager.h"
 #include "components/password_manager/core/browser/password_manager_test_utils.h"
 #include "components/password_manager/core/browser/test_password_store.h"
 #include "components/password_manager/core/common/password_manager_switches.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 103 matching lines @@
 
   bool infobar_is_being_shown_;
   InfoBarService* infobar_service_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarObserver);
 };
 
 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;
   }
 
   void AcceptImpl() const override {
     ui_controller_->SavePassword();
     EXPECT_FALSE(IsShowingPrompt());
   }
 
   void AcceptUpdatePromptImpl(
       const autofill::PasswordForm& form) const override {
     ui_controller_->UpdatePassword(form);
     EXPECT_FALSE(IsShowingUpdatePrompt());
   }
-  ManagePasswordsUIController* const ui_controller_;
+  PasswordsModelDelegate* const ui_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleObserver);
 };
 
 scoped_ptr<PromptObserver> PromptObserver::Create(
     content::WebContents* web_contents) {
   if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
     return scoped_ptr<PromptObserver>(new BubbleObserver(web_contents));
   } else {
     return scoped_ptr<PromptObserver>(new InfoBarObserver(web_contents));
@@ skipping 156 matching lines @@
       "  var element = document.getElementById('%s');"
       "window.domAutomationController.send(element && element.value == '%s');",
       iframe_id.c_str(), iframe_id.c_str(), element_id.c_str(),
       element_id.c_str(), expected_value.c_str());
   bool return_value = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       RenderViewHost(), value_check_script, &return_value));
   EXPECT_TRUE(return_value) << "element_id = " << element_id
                             << ", expected_value = " << expected_value;
 }