| 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 781a0544c457c7f6049a822ced65e9b091c82123..2e20994ddf17e896a157de78db5e004d375f8ce6 100644
|
| --- a/base/trace_event/trace_event_memory_unittest.cc
|
| +++ b/base/trace_event/trace_event_memory_unittest.cc
|
| @@ -7,13 +7,10 @@
|
| #include <sstream>
|
| #include <string>
|
|
|
| +#include "base/allocator/allocator_extension.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 {
|
|
|
| @@ -21,7 +18,11 @@ namespace trace_event {
|
| // can be a friend of TraceMemoryController.
|
| class TraceMemoryTest : public testing::Test {
|
| public:
|
| - TraceMemoryTest() {}
|
| + TraceMemoryTest() {
|
| + // This is needed for the using heap profiling methods from allocator.
|
| + base::allocator::InitializeAllocator();
|
| + }
|
| +
|
| ~TraceMemoryTest() override {}
|
|
|
| private:
|
| @@ -39,9 +40,8 @@ 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.task_runner(), ::HeapProfilerWithPseudoStackStart,
|
| - ::HeapProfilerStop, ::GetHeapProfile));
|
| + scoped_ptr<TraceMemoryController> controller(
|
| + new TraceMemoryController(message_loop.task_runner()));
|
| EXPECT_EQ(1u, TraceLog::GetInstance()->GetObserverCountForTest());
|
| EXPECT_TRUE(
|
| TraceLog::GetInstance()->HasEnabledStateObserver(controller.get()));
|
|
|