Chromium Code Reviews| Index: chrome/browser/chromeos/device/input_service_test_helper.cc |
| diff --git a/chrome/browser/chromeos/device/input_service_test_helper.cc b/chrome/browser/chromeos/device/input_service_test_helper.cc |
| index 7cc5e87b56eb22f9e330e5a6eb71028e4f3c42a2..2379f30db0e159ca6649cdff727110073ac89ea0 100644 |
| --- a/chrome/browser/chromeos/device/input_service_test_helper.cc |
| +++ b/chrome/browser/chromeos/device/input_service_test_helper.cc |
| @@ -8,11 +8,9 @@ |
| #include "base/memory/ptr_util.h" |
| #include "base/run_loop.h" |
| #include "chrome/browser/chromeos/device/input_service_proxy.h" |
| -#include "content/public/browser/browser_thread.h" |
| #include "device/hid/fake_input_service_linux.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| -using content::BrowserThread; |
| using device::InputServiceLinux; |
| using device::FakeInputServiceLinux; |
| @@ -20,17 +18,17 @@ namespace chromeos { |
| namespace { |
| -void InitInputServiceOnFileThread() { |
| +void InitInputServiceOnInputServiceThread() { |
|
fdoray
2017/06/20 12:42:39
InitInputServiceOnInputServiceSequence
Since you
xiyuan
2017/06/20 15:26:55
Done.
|
| InputServiceLinux::SetForTesting(base::MakeUnique<FakeInputServiceLinux>()); |
| } |
| -void AddDeviceOnFileThread(const InputDeviceInfo& device) { |
| +void AddDeviceOnInputServiceThread(const InputDeviceInfo& device) { |
|
fdoray
2017/06/20 12:42:39
AddDeviceOnInputServiceSequence
xiyuan
2017/06/20 15:26:55
Done.
|
| FakeInputServiceLinux* service = |
| static_cast<FakeInputServiceLinux*>(InputServiceLinux::GetInstance()); |
| service->AddDeviceForTesting(device); |
| } |
| -void RemoveDeviceOnFileThread(const std::string& id) { |
| +void RemoveDeviceOnInputServiceThread(const std::string& id) { |
|
fdoray
2017/06/20 12:42:39
RemoveDeviceOnInputServiceSequence
xiyuan
2017/06/20 15:26:55
Done.
|
| FakeInputServiceLinux* service = |
| static_cast<FakeInputServiceLinux*>(InputServiceLinux::GetInstance()); |
| service->RemoveDeviceForTesting(id); |
| @@ -118,8 +116,8 @@ const char InputServiceTestHelper::kKeyboardId[] = "keyboard"; |
| const char InputServiceTestHelper::kMouseId[] = "mouse"; |
| InputServiceTestHelper::InputServiceTestHelper() : observer_(new TestObserver) { |
| - BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
| - base::Bind(&InitInputServiceOnFileThread)); |
| + InputServiceProxy::GetInputServiceTaskRunner()->PostTask( |
| + FROM_HERE, base::Bind(&InitInputServiceOnInputServiceThread)); |
| } |
| InputServiceTestHelper::~InputServiceTestHelper() {} |
| @@ -142,15 +140,15 @@ void InputServiceTestHelper::AddDeviceToService(bool is_mouse, |
| device.type = type; |
| device.is_mouse = is_mouse; |
| device.is_keyboard = !is_mouse; |
| - BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
| - base::Bind(&AddDeviceOnFileThread, device)); |
| + InputServiceProxy::GetInputServiceTaskRunner()->PostTask( |
| + FROM_HERE, base::Bind(&AddDeviceOnInputServiceThread, device)); |
| observer_->WaitForDeviceAddition(device); |
| } |
| void InputServiceTestHelper::RemoveDeviceFromService(bool is_mouse) { |
| std::string id = is_mouse ? kMouseId : kKeyboardId; |
| - BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
| - base::Bind(&RemoveDeviceOnFileThread, id)); |
| + InputServiceProxy::GetInputServiceTaskRunner()->PostTask( |
| + FROM_HERE, base::Bind(&RemoveDeviceOnInputServiceThread, id)); |
| observer_->WaitForDeviceRemoval(id); |
| } |