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

Side by Side Diff: chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)
Patch Set: Address comments Created 3 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 (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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/macros.h" 7 #include "base/macros.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/enrollment/mock_enrollment_screen.h" 10 #include "chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.h"
11 #include "chrome/browser/chromeos/login/oobe_screen.h"
11 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h" 12 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
12 #include "chrome/browser/chromeos/login/startup_utils.h" 13 #include "chrome/browser/chromeos/login/startup_utils.h"
13 #include "chrome/browser/chromeos/login/test/js_checker.h" 14 #include "chrome/browser/chromeos/login/test/js_checker.h"
14 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" 15 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
15 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" 16 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
16 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 17 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
17 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 18 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
18 #include "chrome/browser/chromeos/login/wizard_controller.h" 19 #include "chrome/browser/chromeos/login/wizard_controller.h"
19 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"
20 #include "chromeos/chromeos_switches.h" 20 #include "chromeos/chromeos_switches.h"
21 #include "chromeos/chromeos_test_utils.h" 21 #include "chromeos/chromeos_test_utils.h"
22 #include "content/public/test/test_utils.h" 22 #include "content/public/test/test_utils.h"
23 #include "testing/gmock/include/gmock/gmock.h" 23 #include "testing/gmock/include/gmock/gmock.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 25
26 using testing::InvokeWithoutArgs; 26 using testing::InvokeWithoutArgs;
27 using testing::Mock; 27 using testing::Mock;
28 using testing::_; 28 using testing::_;
29 29
30 namespace chromeos { 30 namespace chromeos {
31 31
32 class EnrollmentScreenTest : public WizardInProcessBrowserTest { 32 class EnrollmentScreenTest : public WizardInProcessBrowserTest {
33 public: 33 public:
34 EnrollmentScreenTest() 34 EnrollmentScreenTest()
35 : WizardInProcessBrowserTest( 35 : WizardInProcessBrowserTest(OobeScreen::SCREEN_OOBE_ENROLLMENT) {}
36 WizardController::kEnrollmentScreenName) {}
37 36
38 private: 37 private:
39 DISALLOW_COPY_AND_ASSIGN(EnrollmentScreenTest); 38 DISALLOW_COPY_AND_ASSIGN(EnrollmentScreenTest);
40 }; 39 };
41 40
42 IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, TestCancel) { 41 IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, TestCancel) {
43 ASSERT_TRUE(WizardController::default_controller()); 42 ASSERT_TRUE(WizardController::default_controller());
44 43
45 EnrollmentScreen* enrollment_screen = 44 EnrollmentScreen* enrollment_screen =
46 EnrollmentScreen::Get(WizardController::default_controller()); 45 EnrollmentScreen::Get(WizardController::default_controller());
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit)); 286 .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
288 enrollment_screen->OnCancel(); 287 enrollment_screen->OnCancel();
289 content::RunThisRunLoop(&run_loop); 288 content::RunThisRunLoop(&run_loop);
290 Mock::VerifyAndClearExpectations(&mock_base_screen_delegate); 289 Mock::VerifyAndClearExpectations(&mock_base_screen_delegate);
291 290
292 static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ = 291 static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
293 WizardController::default_controller(); 292 WizardController::default_controller();
294 } 293 }
295 294
296 } // namespace chromeos 295 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698