Index: components/gcm_driver/instance_id/instance_id_driver_unittest.cc |
diff --git a/components/gcm_driver/instance_id/instance_id_driver_unittest.cc b/components/gcm_driver/instance_id/instance_id_driver_unittest.cc |
index 7b4e722e01c9021fa2de916592c4e6e98abc86a9..4133e422502665ad8a777f2204f444be68db6ccd 100644 |
--- a/components/gcm_driver/instance_id/instance_id_driver_unittest.cc |
+++ b/components/gcm_driver/instance_id/instance_id_driver_unittest.cc |
@@ -10,9 +10,9 @@ |
#include "base/bind.h" |
#include "base/macros.h" |
-#include "base/message_loop/message_loop.h" |
#include "base/run_loop.h" |
#include "base/strings/string_util.h" |
+#include "base/test/scoped_task_environment.h" |
#include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h" |
#include "components/gcm_driver/instance_id/instance_id.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -52,7 +52,9 @@ bool VerifyInstanceID(const std::string& str) { |
class InstanceIDDriverTest : public testing::Test { |
public: |
- InstanceIDDriverTest(); |
+ InstanceIDDriverTest() |
+ : scoped_task_environment_( |
+ base::test::ScopedTaskEnvironment::MainThreadType::UI) {} |
~InstanceIDDriverTest() override; |
// testing::Test: |
@@ -87,7 +89,7 @@ class InstanceIDDriverTest : public testing::Test { |
void GetTokenCompleted(const std::string& token, InstanceID::Result result); |
void DeleteTokenCompleted(InstanceID::Result result); |
- base::MessageLoopForUI message_loop_; |
+ base::test::ScopedTaskEnvironment scoped_task_environment_; |
std::unique_ptr<FakeGCMDriverForInstanceID> gcm_driver_; |
std::unique_ptr<InstanceIDDriver> driver_; |