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

Unified Diff: device/u2f/u2f_hid_device_unittest.cc

Issue 2885143002: Use the task scheduler in the new Windows USB backend (Closed)
Patch Set: Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: device/u2f/u2f_hid_device_unittest.cc
diff --git a/device/u2f/u2f_hid_device_unittest.cc b/device/u2f/u2f_hid_device_unittest.cc
index 99278508b1d3f2e47929fdc8f92b7c7d3ca24163..f1f09159bd54dd02225e92ac5ffecc6ca166732e 100644
--- a/device/u2f/u2f_hid_device_unittest.cc
+++ b/device/u2f/u2f_hid_device_unittest.cc
@@ -6,10 +6,8 @@
#include "base/bind.h"
#include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
-#include "base/test/test_io_thread.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/test/scoped_task_environment.h"
#include "device/base/mock_device_client.h"
#include "device/hid/hid_connection.h"
#include "device/hid/hid_device_filter.h"
@@ -165,17 +163,13 @@ class TestDeviceCallback {
class U2fHidDeviceTest : public testing::Test {
public:
- void SetUp() override {
- message_loop_.reset(new base::MessageLoopForUI());
- io_thread_.reset(new base::TestIOThread(base::TestIOThread::kAutoStart));
- device_client_.reset(
- new device::TestDeviceClient(io_thread_->task_runner()));
- }
+ U2fHidDeviceTest()
+ : scoped_task_environment_(
+ base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
- protected:
- std::unique_ptr<base::MessageLoopForUI> message_loop_;
- std::unique_ptr<base::TestIOThread> io_thread_;
- std::unique_ptr<device::TestDeviceClient> device_client_;
+ private:
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
mcasas 2017/05/16 21:24:24 nit: probably const.
+ TestDeviceClient device_client_;
};
TEST_F(U2fHidDeviceTest, TestHidDeviceVersion) {

Powered by Google App Engine
This is Rietveld 408576698