Update from https://crrev.com/328418

base/trace_event/trace_event_memory_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 "base/trace_event/trace_event_memory.h"
 
 #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"
 
 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
 #endif
 
 namespace base {
 namespace trace_event {
 
@@ skipping 12 matching lines @@
 
 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
 
 TEST_F(TraceMemoryTest, TraceMemoryController) {
   MessageLoop message_loop;
 
   // Start with no observers of the TraceLog.
   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()));
 
   // By default the observer isn't dumping memory profiles.
   EXPECT_FALSE(controller->IsTimerRunningForTest());
 
   // Simulate enabling tracing.
   controller->StartProfiling();
   message_loop.RunUntilIdle();
@@ skipping 172 matching lines @@
   EXPECT_STREQ("null", StringFromHexAddress("0x0"));
   EXPECT_STREQ("error", StringFromHexAddress("not an address"));
   const char kHello[] = "hello";
   std::ostringstream hex_address;
   hex_address << &kHello;
   EXPECT_STREQ(kHello, StringFromHexAddress(hex_address.str()));
 }
 
 }  // namespace trace_event
 }  // namespace base