Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1202)

Side by Side Diff: chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/ui/idle_logout_dialog_view.h" 5 #include "chrome/browser/chromeos/ui/idle_logout_dialog_view.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "chrome/browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h" 8 #include "chrome/browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "ui/views/widget/widget.h" 12 #include "ui/views/widget/widget.h"
13 13
14 namespace chromeos { 14 namespace chromeos {
15 15
16 class MockIdleLogoutSettingsProvider : public IdleLogoutSettingsProvider { 16 class MockIdleLogoutSettingsProvider : public IdleLogoutSettingsProvider {
17 public: 17 public:
18 explicit MockIdleLogoutSettingsProvider(KioskModeSettings* mock_settings) 18 explicit MockIdleLogoutSettingsProvider(KioskModeSettings* mock_settings)
19 : mock_settings_(mock_settings) {} 19 : mock_settings_(mock_settings) {}
20 20
21 virtual base::TimeDelta GetCountdownUpdateInterval() OVERRIDE { 21 virtual base::TimeDelta GetCountdownUpdateInterval() override {
22 return base::TimeDelta::FromMilliseconds(0); 22 return base::TimeDelta::FromMilliseconds(0);
23 } 23 }
24 24
25 virtual KioskModeSettings* GetKioskModeSettings() OVERRIDE { 25 virtual KioskModeSettings* GetKioskModeSettings() override {
26 return mock_settings_; 26 return mock_settings_;
27 } 27 }
28 28
29 virtual void LogoutCurrentUser(IdleLogoutDialogView* dialog) OVERRIDE { 29 virtual void LogoutCurrentUser(IdleLogoutDialogView* dialog) override {
30 dialog->GetWidget()->Close(); 30 dialog->GetWidget()->Close();
31 } 31 }
32 32
33 private: 33 private:
34 KioskModeSettings* mock_settings_; 34 KioskModeSettings* mock_settings_;
35 35
36 DISALLOW_COPY_AND_ASSIGN(MockIdleLogoutSettingsProvider); 36 DISALLOW_COPY_AND_ASSIGN(MockIdleLogoutSettingsProvider);
37 }; 37 };
38 38
39 class IdleLogoutDialogViewTest : public InProcessBrowserTest { 39 class IdleLogoutDialogViewTest : public InProcessBrowserTest {
40 public: 40 public:
41 IdleLogoutDialogViewTest() {} 41 IdleLogoutDialogViewTest() {}
42 42
43 virtual ~IdleLogoutDialogViewTest() {} 43 virtual ~IdleLogoutDialogViewTest() {}
44 44
45 virtual void SetUpOnMainThread() OVERRIDE { 45 virtual void SetUpOnMainThread() override {
46 mock_settings_.reset(new MockKioskModeSettings()); 46 mock_settings_.reset(new MockKioskModeSettings());
47 mock_provider_.reset( 47 mock_provider_.reset(
48 new MockIdleLogoutSettingsProvider(mock_settings_.get())); 48 new MockIdleLogoutSettingsProvider(mock_settings_.get()));
49 IdleLogoutDialogView::set_settings_provider(mock_provider_.get()); 49 IdleLogoutDialogView::set_settings_provider(mock_provider_.get());
50 } 50 }
51 51
52 void ExpectOpenDialog() { 52 void ExpectOpenDialog() {
53 IdleLogoutDialogView* dialog = IdleLogoutDialogView::current_instance(); 53 IdleLogoutDialogView* dialog = IdleLogoutDialogView::current_instance();
54 ASSERT_TRUE(dialog != NULL); 54 ASSERT_TRUE(dialog != NULL);
55 EXPECT_TRUE(dialog->visible()); 55 EXPECT_TRUE(dialog->visible());
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest, 113 IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest,
114 ShowDialogAndFinishCountdown) { 114 ShowDialogAndFinishCountdown) {
115 IdleLogoutDialogView::ShowDialog(); 115 IdleLogoutDialogView::ShowDialog();
116 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog()); 116 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog());
117 117
118 content::RunAllPendingInMessageLoop(); 118 content::RunAllPendingInMessageLoop();
119 ExpectClosedDialog(); 119 ExpectClosedDialog();
120 } 120 }
121 121
122 } // namespace chromeos 122 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/ui/idle_logout_dialog_view.h ('k') | chrome/browser/chromeos/ui/inline_login_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698