Commit a16ef364 authored by Fabio Tirelo's avatar Fabio Tirelo Committed by Commit Bot

Chrome Cleaner UI: Remove duplicate mock class

Bug: 776538
Change-Id: I265f3329477f695e437fcb0e41beb8bfc914d0b9
Reviewed-on: https://chromium-review.googlesource.com/796592Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Fabio Tirelo <ftirelo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520227}
parent 2515aaa6
......@@ -10,6 +10,7 @@
#include "base/memory/ptr_util.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_dialog_controller_win.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_controller_win.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/test/test_browser_dialog.h"
......@@ -17,29 +18,11 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
using ::testing::_;
using ::testing::NiceMock;
using ::testing::Return;
namespace {
class MockChromeCleanerController
: public safe_browsing::ChromeCleanerController {
public:
MOCK_METHOD0(ShouldShowCleanupInSettingsUI, bool());
MOCK_METHOD0(IsPoweredByPartner, bool());
MOCK_CONST_METHOD0(state, State());
MOCK_CONST_METHOD0(idle_reason, IdleReason());
MOCK_METHOD1(SetLogsEnabled, void(bool));
MOCK_CONST_METHOD0(logs_enabled, bool());
MOCK_METHOD0(ResetIdleState, void());
MOCK_METHOD1(AddObserver, void(Observer*));
MOCK_METHOD1(RemoveObserver, void(Observer*));
MOCK_METHOD1(Scan, void(const safe_browsing::SwReporterInvocation&));
MOCK_METHOD2(ReplyWithUserResponse, void(Profile*, UserResponse));
MOCK_METHOD0(Reboot, void());
};
class MockChromeCleanerDialogController
: public safe_browsing::ChromeCleanerDialogController {
public:
......@@ -59,7 +42,8 @@ class ChromeCleanerDialogTest : public DialogBrowserTest {
: mock_dialog_controller_(
base::MakeUnique<NiceMock<MockChromeCleanerDialogController>>()),
mock_cleaner_controller_(
base::MakeUnique<NiceMock<MockChromeCleanerController>>()) {
base::MakeUnique<
NiceMock<safe_browsing::MockChromeCleanerController>>()) {
ON_CALL(*mock_dialog_controller_, LogsEnabled())
.WillByDefault(Return(true));
ON_CALL(*mock_cleaner_controller_, state())
......@@ -77,7 +61,7 @@ class ChromeCleanerDialogTest : public DialogBrowserTest {
// to suppress warnings about uninteresting calls.
std::unique_ptr<NiceMock<MockChromeCleanerDialogController>>
mock_dialog_controller_;
std::unique_ptr<NiceMock<MockChromeCleanerController>>
std::unique_ptr<NiceMock<safe_browsing::MockChromeCleanerController>>
mock_cleaner_controller_;
private:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment