| Index: chrome/browser/ui/cocoa/passwords/base_passwords_controller_test.h
|
| diff --git a/chrome/browser/ui/cocoa/passwords/base_passwords_controller_test.h b/chrome/browser/ui/cocoa/passwords/base_passwords_controller_test.h
|
| index 7153b8905ce0a371f85112794a49eee6979e79ec..27c20724b0ada7dde853fe3c92da799391e439d5 100644
|
| --- a/chrome/browser/ui/cocoa/passwords/base_passwords_controller_test.h
|
| +++ b/chrome/browser/ui/cocoa/passwords/base_passwords_controller_test.h
|
| @@ -5,18 +5,19 @@
|
| #ifndef CHROME_BROWSER_UI_COCOA_PASSWORDS_BASE_PASSWORDS_CONTROLLER_TEST_H_
|
| #define CHROME_BROWSER_UI_COCOA_PASSWORDS_BASE_PASSWORDS_CONTROLLER_TEST_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/mac/scoped_nsobject.h"
|
| #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
|
| #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
|
| #import "chrome/browser/ui/cocoa/passwords/base_passwords_content_view_controller.h"
|
| #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
|
| +#include "chrome/browser/ui/passwords/passwords_model_delegate_mock.h"
|
|
|
| namespace content {
|
| class WebContents;
|
| } // namespace content
|
| -
|
| -class ManagePasswordsUIControllerMock;
|
| -class ManagePasswordsBubbleModel;
|
| +class PasswordsModelDelegateMock;
|
|
|
| // Helper delegate for testing the views of the password management bubble.
|
| @interface ContentViewDelegateMock : NSObject<BasePasswordsContentViewDelegate>
|
| @@ -32,7 +33,9 @@ class ManagePasswordsControllerTest : public CocoaProfileTest {
|
| ~ManagePasswordsControllerTest() override;
|
| void SetUp() override;
|
|
|
| - ManagePasswordsUIControllerMock* ui_controller() { return ui_controller_; }
|
| + PasswordsModelDelegateMock* ui_controller() {
|
| + return ui_controller_.get();
|
| + }
|
| ContentViewDelegateMock* delegate() { return delegate_.get(); }
|
| ManagePasswordsBubbleModel* GetModelAndCreateIfNull();
|
|
|
| @@ -47,7 +50,7 @@ class ManagePasswordsControllerTest : public CocoaProfileTest {
|
| virtual ManagePasswordsBubbleModel::DisplayReason GetDisplayReason() const;
|
|
|
| private:
|
| - ManagePasswordsUIControllerMock* ui_controller_;
|
| + std::unique_ptr<PasswordsModelDelegateMock> ui_controller_;
|
| std::unique_ptr<content::WebContents> test_web_contents_;
|
| std::unique_ptr<ManagePasswordsBubbleModel> model_;
|
| base::scoped_nsobject<ContentViewDelegateMock> delegate_;
|
|
|