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

Side by Side Diff: chrome/browser/chromeos/login/login_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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
8 #include "chrome/browser/chromeos/login/login_wizard.h" 8 #include "chrome/browser/chromeos/login/login_wizard.h"
9 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 9 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
10 #include "chrome/browser/chromeos/login/wizard_controller.h" 10 #include "chrome/browser/chromeos/login/wizard_controller.h"
(...skipping 14 matching lines...) Expand all
25 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
26 26
27 using ::testing::_; 27 using ::testing::_;
28 using ::testing::AnyNumber; 28 using ::testing::AnyNumber;
29 using ::testing::Return; 29 using ::testing::Return;
30 30
31 namespace { 31 namespace {
32 32
33 class LoginUserTest : public InProcessBrowserTest { 33 class LoginUserTest : public InProcessBrowserTest {
34 protected: 34 protected:
35 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 35 virtual void SetUpCommandLine(CommandLine* command_line) override {
36 command_line->AppendSwitchASCII( 36 command_line->AppendSwitchASCII(
37 chromeos::switches::kLoginUser, "TestUser@gmail.com"); 37 chromeos::switches::kLoginUser, "TestUser@gmail.com");
38 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, 38 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
39 "hash"); 39 "hash");
40 } 40 }
41 }; 41 };
42 42
43 class LoginGuestTest : public InProcessBrowserTest { 43 class LoginGuestTest : public InProcessBrowserTest {
44 protected: 44 protected:
45 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 45 virtual void SetUpCommandLine(CommandLine* command_line) override {
46 command_line->AppendSwitch(chromeos::switches::kGuestSession); 46 command_line->AppendSwitch(chromeos::switches::kGuestSession);
47 command_line->AppendSwitch(::switches::kIncognito); 47 command_line->AppendSwitch(::switches::kIncognito);
48 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, 48 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
49 "hash"); 49 "hash");
50 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser, 50 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
51 chromeos::login::kGuestUserName); 51 chromeos::login::kGuestUserName);
52 } 52 }
53 }; 53 };
54 54
55 class LoginCursorTest : public InProcessBrowserTest { 55 class LoginCursorTest : public InProcessBrowserTest {
56 protected: 56 protected:
57 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 57 virtual void SetUpCommandLine(CommandLine* command_line) override {
58 command_line->AppendSwitch(chromeos::switches::kLoginManager); 58 command_line->AppendSwitch(chromeos::switches::kLoginManager);
59 } 59 }
60 }; 60 };
61 61
62 class LoginSigninTest : public InProcessBrowserTest { 62 class LoginSigninTest : public InProcessBrowserTest {
63 protected: 63 protected:
64 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 64 virtual void SetUpCommandLine(CommandLine* command_line) override {
65 command_line->AppendSwitch(chromeos::switches::kLoginManager); 65 command_line->AppendSwitch(chromeos::switches::kLoginManager);
66 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); 66 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
67 } 67 }
68 68
69 virtual void SetUpOnMainThread() OVERRIDE { 69 virtual void SetUpOnMainThread() override {
70 ASSERT_TRUE(tracing::BeginTracingWithWatch( 70 ASSERT_TRUE(tracing::BeginTracingWithWatch(
71 "ui", "ui", "ShowLoginWebUI", 1)); 71 "ui", "ui", "ShowLoginWebUI", 1));
72 } 72 }
73 }; 73 };
74 74
75 // After a chrome crash, the session manager will restart chrome with 75 // After a chrome crash, the session manager will restart chrome with
76 // the -login-user flag indicating that the user is already logged in. 76 // the -login-user flag indicating that the user is already logged in.
77 // This profile should NOT be an OTR profile. 77 // This profile should NOT be an OTR profile.
78 IN_PROC_BROWSER_TEST_F(LoginUserTest, UserPassed) { 78 IN_PROC_BROWSER_TEST_F(LoginUserTest, UserPassed) {
79 Profile* profile = browser()->profile(); 79 Profile* profile = browser()->profile();
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 // Verifies that the webui for login comes up successfully. 120 // Verifies that the webui for login comes up successfully.
121 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) { 121 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) {
122 base::TimeDelta no_timeout; 122 base::TimeDelta no_timeout;
123 EXPECT_TRUE(tracing::WaitForWatchEvent(no_timeout)); 123 EXPECT_TRUE(tracing::WaitForWatchEvent(no_timeout));
124 std::string json_events; 124 std::string json_events;
125 ASSERT_TRUE(tracing::EndTracing(&json_events)); 125 ASSERT_TRUE(tracing::EndTracing(&json_events));
126 } 126 }
127 127
128 } // namespace 128 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/lock/webui_screen_locker.h ('k') | chrome/browser/chromeos/login/login_manager_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698