X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fchromeos%2Fui%2Fidle_logout_dialog_view_browsertest.cc;h=f7433a5ef9b8a55738f07db3dad12338b56e94bf;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=ff5fac3c0918b909f4b41914f977ddbdbcd75c07;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc b/src/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc index ff5fac3..f7433a5 100644 --- a/src/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc +++ b/src/chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h" #include "chrome/test/base/in_process_browser_test.h" -#include "chrome/test/base/ui_test_utils.h" +#include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/widget/widget.h" @@ -18,15 +18,15 @@ public: explicit MockIdleLogoutSettingsProvider(KioskModeSettings* mock_settings) : mock_settings_(mock_settings) {} - virtual base::TimeDelta GetCountdownUpdateInterval() OVERRIDE { + virtual base::TimeDelta GetCountdownUpdateInterval() override { return base::TimeDelta::FromMilliseconds(0); } - virtual KioskModeSettings* GetKioskModeSettings() OVERRIDE { + virtual KioskModeSettings* GetKioskModeSettings() override { return mock_settings_; } - virtual void LogoutCurrentUser(IdleLogoutDialogView* dialog) OVERRIDE { + virtual void LogoutCurrentUser(IdleLogoutDialogView* dialog) override { dialog->GetWidget()->Close(); } @@ -42,7 +42,7 @@ class IdleLogoutDialogViewTest : public InProcessBrowserTest { virtual ~IdleLogoutDialogViewTest() {} - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { mock_settings_.reset(new MockKioskModeSettings()); mock_provider_.reset( new MockIdleLogoutSettingsProvider(mock_settings_.get()));