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

Side by Side Diff: chrome/browser/chromeos/login/login_ui_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.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/screenshot_testing/login_screen_areas.h" 10 #include "chrome/browser/chromeos/login/screenshot_testing/login_screen_areas.h"
(...skipping 20 matching lines...) Expand all
31 31
32 class LoginUITest : public chromeos::LoginManagerTest { 32 class LoginUITest : public chromeos::LoginManagerTest {
33 public: 33 public:
34 LoginUITest() : LoginManagerTest(false) { 34 LoginUITest() : LoginManagerTest(false) {
35 screenshot_testing_ = new ScreenshotTestingMixin; 35 screenshot_testing_ = new ScreenshotTestingMixin;
36 screenshot_testing_->IgnoreArea(areas::kClockArea); 36 screenshot_testing_->IgnoreArea(areas::kClockArea);
37 screenshot_testing_->IgnoreArea(areas::kFirstUserpod); 37 screenshot_testing_->IgnoreArea(areas::kFirstUserpod);
38 screenshot_testing_->IgnoreArea(areas::kSecondUserpod); 38 screenshot_testing_->IgnoreArea(areas::kSecondUserpod);
39 AddMixin(screenshot_testing_); 39 AddMixin(screenshot_testing_);
40 } 40 }
41 virtual ~LoginUITest() {} 41 ~LoginUITest() override {}
42 42
43 protected: 43 protected:
44 ScreenshotTestingMixin* screenshot_testing_; 44 ScreenshotTestingMixin* screenshot_testing_;
45 }; 45 };
46 46
47 IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_LoginUIVisible) { 47 IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_LoginUIVisible) {
48 RegisterUser(kTestUser1); 48 RegisterUser(kTestUser1);
49 RegisterUser(kTestUser2); 49 RegisterUser(kTestUser2);
50 StartupUtils::MarkOobeCompleted(); 50 StartupUtils::MarkOobeCompleted();
51 } 51 }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 IN_PROC_BROWSER_TEST_F(LoginUITest, OobeCatchException) { 95 IN_PROC_BROWSER_TEST_F(LoginUITest, OobeCatchException) {
96 JSExpect("cr.ErrorStore.getInstance().length == 0"); 96 JSExpect("cr.ErrorStore.getInstance().length == 0");
97 js_checker().Execute("aelrt('misprint')"); 97 js_checker().Execute("aelrt('misprint')");
98 JSExpect("cr.ErrorStore.getInstance().length == 1"); 98 JSExpect("cr.ErrorStore.getInstance().length == 1");
99 js_checker().Execute("consle.error('Some error')"); 99 js_checker().Execute("consle.error('Some error')");
100 JSExpect("cr.ErrorStore.getInstance().length == 2"); 100 JSExpect("cr.ErrorStore.getInstance().length == 2");
101 } 101 }
102 102
103 } // namespace chromeos 103 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698