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

Unified Diff: chrome/browser/chromeos/login/hid_detection_browsertest.cc

Issue 2482463002: Remove DeviceMonitorLinux::WillDestroyCurrentMessageLoop(). (Closed)
Patch Set: Fix ChromeOS build error Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/hid_detection_browsertest.cc
diff --git a/chrome/browser/chromeos/login/hid_detection_browsertest.cc b/chrome/browser/chromeos/login/hid_detection_browsertest.cc
index 44392fe2ce66cf2dd04f88233934ebf9ca471adc..1e9421b8a2d437f6cc59303543b59ed2cb84428a 100644
--- a/chrome/browser/chromeos/login/hid_detection_browsertest.cc
+++ b/chrome/browser/chromeos/login/hid_detection_browsertest.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/chromeos/login/test/oobe_base_test.h"
@@ -57,8 +58,8 @@ class HidDetectionTest : public OobeBaseTest {
~HidDetectionTest() override {}
void InitInputService() {
- input_service_linux_.reset(new device::FakeInputServiceLinux);
- InputServiceLinux::SetForTesting(input_service_linux_.get());
+ InputServiceLinux::SetForTesting(
+ base::MakeUnique<device::FakeInputServiceLinux>());
}
void SetUpOnMainThread() override {
@@ -78,8 +79,9 @@ class HidDetectionTest : public OobeBaseTest {
mouse.subsystem = InputDeviceInfo::SUBSYSTEM_INPUT;
mouse.type = InputDeviceInfo::TYPE_USB;
mouse.is_mouse = true;
- LOG(ERROR) << input_service_linux_.get();
- input_service_linux_->AddDeviceForTesting(mouse);
+ static_cast<device::FakeInputServiceLinux*>(
+ InputServiceLinux::GetInstance())
+ ->AddDeviceForTesting(mouse);
}
void AddUsbKeyboard(const std::string& keyboard_id) {
@@ -88,15 +90,15 @@ class HidDetectionTest : public OobeBaseTest {
keyboard.subsystem = InputDeviceInfo::SUBSYSTEM_INPUT;
keyboard.type = InputDeviceInfo::TYPE_USB;
keyboard.is_keyboard = true;
- input_service_linux_->AddDeviceForTesting(keyboard);
+ static_cast<device::FakeInputServiceLinux*>(
+ InputServiceLinux::GetInstance())
+ ->AddDeviceForTesting(keyboard);
}
private:
scoped_refptr<
testing::NiceMock<device::MockBluetoothAdapter> > mock_adapter_;
- std::unique_ptr<device::FakeInputServiceLinux> input_service_linux_;
-
base::WeakPtrFactory<HidDetectionTest> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(HidDetectionTest);

Powered by Google App Engine
This is Rietveld 408576698