chrome/browser/chromeos/login/hid_detection_browsertest.cc - Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/login/hid_detection_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

« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller_browsertest.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | chrome/browser/chromeos/login/screen_manager.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 <memory>	5 #include <memory>

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "base/memory/ptr_util.h"	9 #include "base/memory/ptr_util.h"

10 #include "base/memory/ref_counted.h"	10 #include "base/memory/ref_counted.h"

11 #include "base/memory/weak_ptr.h"	11 #include "base/memory/weak_ptr.h"

	12 #include "chrome/browser/chromeos/login/oobe_screen.h"

12 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"	13 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"

13 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"	14 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"

14 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"

15 #include "content/public/browser/browser_thread.h"	15 #include "content/public/browser/browser_thread.h"

16 #include "device/bluetooth/bluetooth_adapter_factory.h"	16 #include "device/bluetooth/bluetooth_adapter_factory.h"

17 #include "device/bluetooth/test/mock_bluetooth_adapter.h"	17 #include "device/bluetooth/test/mock_bluetooth_adapter.h"

18 #include "device/hid/fake_input_service_linux.h"	18 #include "device/hid/fake_input_service_linux.h"

19 #include "device/hid/input_service_linux.h"	19 #include "device/hid/input_service_linux.h"

20 #include "testing/gmock/include/gmock/gmock.h"	20 #include "testing/gmock/include/gmock/gmock.h"

21	21

22 using content::BrowserThread;	22 using content::BrowserThread;

23 using device::InputServiceLinux;	23 using device::InputServiceLinux;

24 using testing::_;	24 using testing::_;

(...skipping 95 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
120	120

121 IN_PROC_BROWSER_TEST_F(HidDetectionTest, NoDevicesConnected) {	121 IN_PROC_BROWSER_TEST_F(HidDetectionTest, NoDevicesConnected) {

122 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_HID_DETECTION).Wait();	122 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_HID_DETECTION).Wait();

123 }	123 }

124	124

125 IN_PROC_BROWSER_TEST_F(HidDetectionSkipTest, BothDevicesPreConnected) {	125 IN_PROC_BROWSER_TEST_F(HidDetectionSkipTest, BothDevicesPreConnected) {

126 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_NETWORK).Wait();	126 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_NETWORK).Wait();

127 }	127 }

128	128

129 } // namespace chromeos	129 } // namespace chromeos

OLD	NEW