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

Side by Side Diff: chrome/browser/chromeos/login/reset_browsertest.cc

Issue 856493004: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string> 5 #include <string>
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chromeos/login/login_manager_test.h" 9 #include "chrome/browser/chromeos/login/login_manager_test.h"
10 #include "chrome/browser/chromeos/login/startup_utils.h" 10 #include "chrome/browser/chromeos/login/startup_utils.h"
(...skipping 18 matching lines...) Expand all
29 29
30 } // namespace 30 } // namespace
31 31
32 class ResetTest : public LoginManagerTest { 32 class ResetTest : public LoginManagerTest {
33 public: 33 public:
34 ResetTest() : LoginManagerTest(false), 34 ResetTest() : LoginManagerTest(false),
35 update_engine_client_(NULL), 35 update_engine_client_(NULL),
36 session_manager_client_(NULL), 36 session_manager_client_(NULL),
37 power_manager_client_(NULL) { 37 power_manager_client_(NULL) {
38 } 38 }
39 virtual ~ResetTest() {} 39 ~ResetTest() override {}
40 40
41 virtual void SetUpCommandLine(base::CommandLine* command_line) override { 41 void SetUpCommandLine(base::CommandLine* command_line) override {
42 LoginManagerTest::SetUpCommandLine(command_line); 42 LoginManagerTest::SetUpCommandLine(command_line);
43 } 43 }
44 44
45 // LoginManagerTest overrides: 45 // LoginManagerTest overrides:
46 virtual void SetUpInProcessBrowserTestFixture() override { 46 void SetUpInProcessBrowserTestFixture() override {
47 scoped_ptr<DBusThreadManagerSetter> dbus_setter = 47 scoped_ptr<DBusThreadManagerSetter> dbus_setter =
48 chromeos::DBusThreadManager::GetSetterForTesting(); 48 chromeos::DBusThreadManager::GetSetterForTesting();
49 session_manager_client_ = new FakeSessionManagerClient; 49 session_manager_client_ = new FakeSessionManagerClient;
50 dbus_setter->SetSessionManagerClient( 50 dbus_setter->SetSessionManagerClient(
51 scoped_ptr<SessionManagerClient>(session_manager_client_)); 51 scoped_ptr<SessionManagerClient>(session_manager_client_));
52 power_manager_client_ = new FakePowerManagerClient; 52 power_manager_client_ = new FakePowerManagerClient;
53 dbus_setter->SetPowerManagerClient( 53 dbus_setter->SetPowerManagerClient(
54 scoped_ptr<PowerManagerClient>(power_manager_client_)); 54 scoped_ptr<PowerManagerClient>(power_manager_client_));
55 update_engine_client_ = new FakeUpdateEngineClient; 55 update_engine_client_ = new FakeUpdateEngineClient;
56 dbus_setter->SetUpdateEngineClient( 56 dbus_setter->SetUpdateEngineClient(
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 ASSERT_TRUE(JSExecuted("$('reset-confirm-dismiss').click();")); 99 ASSERT_TRUE(JSExecuted("$('reset-confirm-dismiss').click();"));
100 } 100 }
101 101
102 FakeUpdateEngineClient* update_engine_client_; 102 FakeUpdateEngineClient* update_engine_client_;
103 FakeSessionManagerClient* session_manager_client_; 103 FakeSessionManagerClient* session_manager_client_;
104 FakePowerManagerClient* power_manager_client_; 104 FakePowerManagerClient* power_manager_client_;
105 }; 105 };
106 106
107 class ResetFirstAfterBootTest : public ResetTest { 107 class ResetFirstAfterBootTest : public ResetTest {
108 public: 108 public:
109 virtual ~ResetFirstAfterBootTest() {} 109 ~ResetFirstAfterBootTest() override {}
110 110
111 virtual void SetUpCommandLine(base::CommandLine* command_line) override { 111 void SetUpCommandLine(base::CommandLine* command_line) override {
112 LoginManagerTest::SetUpCommandLine(command_line); 112 LoginManagerTest::SetUpCommandLine(command_line);
113 command_line->AppendSwitch(switches::kFirstExecAfterBoot); 113 command_line->AppendSwitch(switches::kFirstExecAfterBoot);
114 } 114 }
115 }; 115 };
116 116
117 IN_PROC_BROWSER_TEST_F(ResetTest, PRE_ShowAndCancel) { 117 IN_PROC_BROWSER_TEST_F(ResetTest, PRE_ShowAndCancel) {
118 RegisterSomeUser(); 118 RegisterSomeUser();
119 } 119 }
120 120
121 IN_PROC_BROWSER_TEST_F(ResetTest, ShowAndCancel) { 121 IN_PROC_BROWSER_TEST_F(ResetTest, ShowAndCancel) {
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 InvokeRollbackOption(); 328 InvokeRollbackOption();
329 JSExpect("$('reset').classList.contains('rollback-proposal-view')"); 329 JSExpect("$('reset').classList.contains('rollback-proposal-view')");
330 CloseResetScreen(); 330 CloseResetScreen();
331 InvokeResetScreen(); 331 InvokeResetScreen();
332 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait(); 332 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait();
333 InvokeRollbackOption(); 333 InvokeRollbackOption();
334 JSExpect("$('reset').classList.contains('rollback-proposal-view')"); 334 JSExpect("$('reset').classList.contains('rollback-proposal-view')");
335 } 335 }
336 336
337 } // namespace chromeos 337 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/profile_auth_data_unittest.cc ('k') | chrome/browser/chromeos/login/saml/saml_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698