Update from https://crrev.com/328418

base/trace_event/trace_event_memory_unittest.cc

Index: base/trace_event/trace_event_memory_unittest.cc
diff --git a/base/trace_event/trace_event_memory_unittest.cc b/base/trace_event/trace_event_memory_unittest.cc
index 47327335ebac06cdc0b4abff566f51b817aea233..781a0544c457c7f6049a822ced65e9b091c82123 100644
--- a/base/trace_event/trace_event_memory_unittest.cc
+++ b/base/trace_event/trace_event_memory_unittest.cc
@@ -7,7 +7,6 @@
 #include <sstream>
 #include <string>
 
-#include "base/message_loop/message_loop.h"
 #include "base/trace_event/trace_event_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -40,12 +39,9 @@ TEST_F(TraceMemoryTest, TraceMemoryController) {
   EXPECT_EQ(0u, TraceLog::GetInstance()->GetObserverCountForTest());
 
   // Creating a controller adds it to the TraceLog observer list.
-  scoped_ptr<TraceMemoryController> controller(
-      new TraceMemoryController(
-          message_loop.message_loop_proxy(),
-          ::HeapProfilerWithPseudoStackStart,
-          ::HeapProfilerStop,
-          ::GetHeapProfile));
+  scoped_ptr<TraceMemoryController> controller(new TraceMemoryController(
+      message_loop.task_runner(), ::HeapProfilerWithPseudoStackStart,
+      ::HeapProfilerStop, ::GetHeapProfile));
   EXPECT_EQ(1u, TraceLog::GetInstance()->GetObserverCountForTest());
   EXPECT_TRUE(
       TraceLog::GetInstance()->HasEnabledStateObserver(controller.get()));