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/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
OLDNEW
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
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698