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

Side by Side Diff: chrome/browser/chromeos/login/enrollment/enrollment_screen_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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" 9 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
10 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" 10 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ = 84 static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
85 WizardController::default_controller(); 85 WizardController::default_controller();
86 } 86 }
87 87
88 class ProvisionedEnrollmentScreenTest : public EnrollmentScreenTest { 88 class ProvisionedEnrollmentScreenTest : public EnrollmentScreenTest {
89 public: 89 public:
90 ProvisionedEnrollmentScreenTest() {} 90 ProvisionedEnrollmentScreenTest() {}
91 91
92 private: 92 private:
93 // Overridden from InProcessBrowserTest: 93 // Overridden from InProcessBrowserTest:
94 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 94 virtual void SetUpCommandLine(CommandLine* command_line) override {
95 base::FilePath test_data_dir; 95 base::FilePath test_data_dir;
96 ASSERT_TRUE(chromeos::test_utils::GetTestDataPath( 96 ASSERT_TRUE(chromeos::test_utils::GetTestDataPath(
97 "app_mode", "kiosk_manifest", &test_data_dir)); 97 "app_mode", "kiosk_manifest", &test_data_dir));
98 command_line->AppendSwitchPath( 98 command_line->AppendSwitchPath(
99 switches::kAppOemManifestFile, 99 switches::kAppOemManifestFile,
100 test_data_dir.AppendASCII("kiosk_manifest.json")); 100 test_data_dir.AppendASCII("kiosk_manifest.json"));
101 } 101 }
102 102
103 DISALLOW_COPY_AND_ASSIGN(ProvisionedEnrollmentScreenTest); 103 DISALLOW_COPY_AND_ASSIGN(ProvisionedEnrollmentScreenTest);
104 }; 104 };
(...skipping 18 matching lines...) Expand all
123 .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit)); 123 .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
124 enrollment_screen->OnCancel(); 124 enrollment_screen->OnCancel();
125 content::RunThisRunLoop(&run_loop); 125 content::RunThisRunLoop(&run_loop);
126 Mock::VerifyAndClearExpectations(&mock_screen_observer); 126 Mock::VerifyAndClearExpectations(&mock_screen_observer);
127 127
128 static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ = 128 static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
129 WizardController::default_controller(); 129 WizardController::default_controller();
130 } 130 }
131 131
132 } // namespace chromeos 132 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698