Replace MessageLoop::current() with ThreadTaskRunnerHandle::Get() in GCM

google_apis/gcm/base/mcs_message_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/gcm/base/mcs_message.h"
 
 #include "base/logging.h"
-#include "base/message_loop/message_loop.h"
+#include "base/test/test_simple_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 const uint64 kAndroidId = 12345;
 const uint64 kSecret = 54321;
 
 class MCSMessageTest : public testing::Test {
  public:
   MCSMessageTest();
   ~MCSMessageTest() override;
 
  private:
-  base::MessageLoop message_loop_;
+  scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
+  base::ThreadTaskRunnerHandle task_runner_handle_;
 };
 
-MCSMessageTest::MCSMessageTest() {
+MCSMessageTest::MCSMessageTest()
+  : task_runner_(new base::TestSimpleTaskRunner()),
+    task_runner_handle_(task_runner_) {

[Nicolas Zea, 2015/07/10 22:39:38]

Do we need the handle here (and in the other tests)?

[jianli, 2015/07/10 23:04:15]

Yes, this is to replace the task runner set in MessageLoop that is being
removed.

[Nicolas Zea, 2015/07/10 23:06:39]

AFAICT this is just storing another reference to task_runner_ though, which
isn't being used. task_runner_ itself will keep the task runner alive, why do we
need a second reference?

[jianli, 2015/07/10 23:11:43]

This is to make ThreadTaskRunnerHandle::Get() work. Otherwise the reference to
TaskRunner instance is not set in TLS.

 }
 
 MCSMessageTest::~MCSMessageTest() {
 }
 
 TEST_F(MCSMessageTest, Invalid) {
   MCSMessage message;
   EXPECT_FALSE(message.IsValid());
 }
 
@@ skipping 45 matching lines @@
   EXPECT_EQ(login_request->ByteSize(), message.size());
   EXPECT_EQ(login_request->SerializeAsString(), message.SerializeAsString());
   EXPECT_EQ(login_request->SerializeAsString(),
             message.GetProtobuf().SerializeAsString());
   login_copy = message.CloneProtobuf();
   EXPECT_EQ(login_request->SerializeAsString(),
             login_copy->SerializeAsString());
 }
 
 }  // namespace gcm