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

Side by Side Diff: chrome/browser/chromeos/login/demo_mode/demo_app_launcher_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 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 } // namespace 59 } // namespace
60 60
61 class DemoAppLauncherTest : public ExtensionBrowserTest { 61 class DemoAppLauncherTest : public ExtensionBrowserTest {
62 public: 62 public:
63 DemoAppLauncherTest() { 63 DemoAppLauncherTest() {
64 set_exit_when_last_browser_closes(false); 64 set_exit_when_last_browser_closes(false);
65 } 65 }
66 66
67 virtual ~DemoAppLauncherTest() {} 67 virtual ~DemoAppLauncherTest() {}
68 68
69 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 69 virtual void SetUpCommandLine(CommandLine* command_line) override {
70 command_line->AppendSwitch(switches::kLoginManager); 70 command_line->AppendSwitch(switches::kLoginManager);
71 command_line->AppendSwitch(switches::kForceLoginManagerInTests); 71 command_line->AppendSwitch(switches::kForceLoginManagerInTests);
72 command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); 72 command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
73 73
74 command_line->AppendSwitchASCII(switches::kDerelictIdleTimeout, "0"); 74 command_line->AppendSwitchASCII(switches::kDerelictIdleTimeout, "0");
75 command_line->AppendSwitchASCII(switches::kOobeTimerInterval, "0"); 75 command_line->AppendSwitchASCII(switches::kOobeTimerInterval, "0");
76 command_line->AppendSwitchASCII(switches::kDerelictDetectionTimeout, "0"); 76 command_line->AppendSwitchASCII(switches::kDerelictDetectionTimeout, "0");
77 } 77 }
78 78
79 virtual void SetUp() OVERRIDE { 79 virtual void SetUp() override {
80 chromeos::DemoAppLauncher::SetDemoAppPathForTesting(GetTestDemoAppPath()); 80 chromeos::DemoAppLauncher::SetDemoAppPathForTesting(GetTestDemoAppPath());
81 ExtensionBrowserTest::SetUp(); 81 ExtensionBrowserTest::SetUp();
82 } 82 }
83 83
84 private: 84 private:
85 DISALLOW_COPY_AND_ASSIGN(DemoAppLauncherTest); 85 DISALLOW_COPY_AND_ASSIGN(DemoAppLauncherTest);
86 }; 86 };
87 87
88 IN_PROC_BROWSER_TEST_F(DemoAppLauncherTest, Basic) { 88 IN_PROC_BROWSER_TEST_F(DemoAppLauncherTest, Basic) {
89 // This test is fairly unique in the sense that the test actually starts as 89 // This test is fairly unique in the sense that the test actually starts as
90 // soon as Chrome launches, so there isn't any typical "launch this test" 90 // soon as Chrome launches, so there isn't any typical "launch this test"
91 // steps that we need to take. All we can do is verify that our demo app 91 // steps that we need to take. All we can do is verify that our demo app
92 // did launch. 92 // did launch.
93 EXPECT_TRUE(VerifyDemoAppLaunch()); 93 EXPECT_TRUE(VerifyDemoAppLaunch());
94 } 94 }
95 95
96 IN_PROC_BROWSER_TEST_F(DemoAppLauncherTest, NoNetwork) { 96 IN_PROC_BROWSER_TEST_F(DemoAppLauncherTest, NoNetwork) {
97 EXPECT_TRUE(VerifyDemoAppLaunch()); 97 EXPECT_TRUE(VerifyDemoAppLaunch());
98 EXPECT_TRUE(VerifyNetworksDisabled()); 98 EXPECT_TRUE(VerifyNetworksDisabled());
99 } 99 }
100 100
101 } // namespace chromeos 101 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698