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

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 4 years 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/wizard_in_process_browser_test.h" 9 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
10 #include "chrome/browser/chromeos/login/wizard_controller.h" 10 #include "chrome/browser/chromeos/login/wizard_controller.h"
11 11
12 namespace chromeos { 12 namespace chromeos {
13 13
14 class HIDDetectionScreenTest : public WizardInProcessBrowserTest { 14 class HIDDetectionScreenTest : public WizardInProcessBrowserTest {
15 public: 15 public:
16 HIDDetectionScreenTest() 16 HIDDetectionScreenTest()
17 : WizardInProcessBrowserTest(WizardController::kHIDDetectionScreenName) {} 17 : WizardInProcessBrowserTest(OobeScreen::SCREEN_OOBE_HID_DETECTION) {}
18 18
19 protected: 19 protected:
20 void SetUpOnMainThread() override { 20 void SetUpOnMainThread() override {
21 helper_.reset(new InputServiceTestHelper); 21 helper_.reset(new InputServiceTestHelper);
22 WizardInProcessBrowserTest::SetUpOnMainThread(); 22 WizardInProcessBrowserTest::SetUpOnMainThread();
23 ASSERT_TRUE(WizardController::default_controller()); 23 ASSERT_TRUE(WizardController::default_controller());
24 24
25 hid_detection_screen_ = static_cast<HIDDetectionScreen*>( 25 hid_detection_screen_ = static_cast<HIDDetectionScreen*>(
26 WizardController::default_controller()->GetScreen( 26 WizardController::default_controller()->GetScreen(
27 WizardController::kHIDDetectionScreenName)); 27 OobeScreen::SCREEN_OOBE_HID_DETECTION));
28 ASSERT_TRUE(hid_detection_screen_); 28 ASSERT_TRUE(hid_detection_screen_);
29 ASSERT_EQ(WizardController::default_controller()->current_screen(), 29 ASSERT_EQ(WizardController::default_controller()->current_screen(),
30 hid_detection_screen_); 30 hid_detection_screen_);
31 ASSERT_TRUE(hid_detection_screen_->view_); 31 ASSERT_TRUE(hid_detection_screen_->view_);
32 32
33 helper_->SetProxy(&hid_detection_screen_->input_service_proxy_); 33 helper_->SetProxy(&hid_detection_screen_->input_service_proxy_);
34 } 34 }
35 35
36 void TearDownOnMainThread() override { 36 void TearDownOnMainThread() override {
37 helper_->ClearProxy(); 37 helper_->ClearProxy();
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 helper()->AddDeviceToService(false, InputDeviceInfo::TYPE_BLUETOOTH); 100 helper()->AddDeviceToService(false, InputDeviceInfo::TYPE_BLUETOOTH);
101 EXPECT_EQ("paired", 101 EXPECT_EQ("paired",
102 context()->GetString(HIDDetectionModel::kContextKeyMouseState)); 102 context()->GetString(HIDDetectionModel::kContextKeyMouseState));
103 EXPECT_EQ("paired", 103 EXPECT_EQ("paired",
104 context()->GetString(HIDDetectionModel::kContextKeyKeyboardState)); 104 context()->GetString(HIDDetectionModel::kContextKeyKeyboardState));
105 EXPECT_TRUE(context()->GetBoolean( 105 EXPECT_TRUE(context()->GetBoolean(
106 HIDDetectionModel::kContextKeyContinueButtonEnabled)); 106 HIDDetectionModel::kContextKeyContinueButtonEnabled));
107 } 107 }
108 108
109 } // namespace chromeos 109 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698