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

Side by Side Diff: chrome/browser/chromeos/login/hid_detection_browsertest.cc

Issue 2937253003: cros: Replace BrowserThread::FILE in InputServiceProxy (Closed)
Patch Set: rebase Created 3 years, 6 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"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 } // namespace 45 } // namespace
46 46
47 namespace chromeos { 47 namespace chromeos {
48 48
49 class HidDetectionTest : public OobeBaseTest { 49 class HidDetectionTest : public OobeBaseTest {
50 public: 50 public:
51 typedef device::InputServiceLinux::InputDeviceInfo InputDeviceInfo; 51 typedef device::InputServiceLinux::InputDeviceInfo InputDeviceInfo;
52 52
53 HidDetectionTest() : weak_ptr_factory_(this) { 53 HidDetectionTest() : weak_ptr_factory_(this) {
54 InputServiceProxy::SetThreadIdForTesting(content::BrowserThread::UI); 54 InputServiceProxy::SetUseUIThreadForTesting(true);
55 HidDetectionTest::InitInputService(); 55 HidDetectionTest::InitInputService();
56 } 56 }
57 57
58 ~HidDetectionTest() override {} 58 ~HidDetectionTest() override {}
59 59
60 void InitInputService() { 60 void InitInputService() {
61 InputServiceLinux::SetForTesting( 61 InputServiceLinux::SetForTesting(
62 base::MakeUnique<device::FakeInputServiceLinux>()); 62 base::MakeUnique<device::FakeInputServiceLinux>());
63 } 63 }
64 64
(...skipping 55 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