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

Side by Side Diff: chrome/browser/chromeos/login/screens/hid_detection_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) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 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/macros.h" 5 #include "base/macros.h"
6 #include "chrome/browser/chromeos/device/input_service_test_helper.h" 6 #include "chrome/browser/chromeos/device/input_service_test_helper.h"
7 #include "chrome/browser/chromeos/login/screens/base_screen.h" 7 #include "chrome/browser/chromeos/login/screens/base_screen.h"
8 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h" 8 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
9 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" 9 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" 10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
11 #include "chrome/browser/chromeos/login/wizard_controller.h" 11 #include "chrome/browser/chromeos/login/wizard_controller.h"
12 12
13 namespace chromeos { 13 namespace chromeos {
14 14
15 class HIDDetectionScreenTest : public WizardInProcessBrowserTest { 15 class HIDDetectionScreenTest : public WizardInProcessBrowserTest {
16 public: 16 public:
17 HIDDetectionScreenTest() 17 HIDDetectionScreenTest()
18 : WizardInProcessBrowserTest(WizardController::kHIDDetectionScreenName) {} 18 : WizardInProcessBrowserTest(OobeScreen::SCREEN_OOBE_HID_DETECTION) {}
19 19
20 protected: 20 protected:
21 void SetUpOnMainThread() override { 21 void SetUpOnMainThread() override {
22 helper_.reset(new InputServiceTestHelper); 22 helper_.reset(new InputServiceTestHelper);
23 WizardInProcessBrowserTest::SetUpOnMainThread(); 23 WizardInProcessBrowserTest::SetUpOnMainThread();
24 ASSERT_TRUE(WizardController::default_controller()); 24 ASSERT_TRUE(WizardController::default_controller());
25 25
26 hid_detection_screen_ = static_cast<HIDDetectionScreen*>( 26 hid_detection_screen_ = static_cast<HIDDetectionScreen*>(
27 WizardController::default_controller()->GetScreen( 27 WizardController::default_controller()->GetScreen(
28 WizardController::kHIDDetectionScreenName)); 28 OobeScreen::SCREEN_OOBE_HID_DETECTION));
29 ASSERT_TRUE(hid_detection_screen_); 29 ASSERT_TRUE(hid_detection_screen_);
30 ASSERT_EQ(WizardController::default_controller()->current_screen(), 30 ASSERT_EQ(WizardController::default_controller()->current_screen(),
31 hid_detection_screen_); 31 hid_detection_screen_);
32 ASSERT_TRUE(hid_detection_screen_->view_); 32 ASSERT_TRUE(hid_detection_screen_->view_);
33 33
34 hid_detection_screen()->SetAdapterInitialPoweredForTesting(false); 34 hid_detection_screen()->SetAdapterInitialPoweredForTesting(false);
35 helper_->SetProxy(&hid_detection_screen_->input_service_proxy_); 35 helper_->SetProxy(&hid_detection_screen_->input_service_proxy_);
36 } 36 }
37 37
38 void TearDownOnMainThread() override { 38 void TearDownOnMainThread() override {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 // Simulate the user's click on "Continue" button. 149 // Simulate the user's click on "Continue" button.
150 hid_detection_screen()->OnContinueButtonClicked(); 150 hid_detection_screen()->OnContinueButtonClicked();
151 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_NETWORK).Wait(); 151 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_NETWORK).Wait();
152 152
153 // The adapter should be powered off at this moment. 153 // The adapter should be powered off at this moment.
154 EXPECT_FALSE(adapter()->IsPowered()); 154 EXPECT_FALSE(adapter()->IsPowered());
155 } 155 }
156 156
157 } // namespace chromeos 157 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698