Chromium Code Reviews| Index: base/trace_event/memory_dump_manager_unittest.cc |
| diff --git a/base/trace_event/memory_dump_manager_unittest.cc b/base/trace_event/memory_dump_manager_unittest.cc |
| index d32bdaaa93c22f6fff3fef0e0e10cbfafb72d015..8f6547f9e0c35f4ebf786a3a3e472636ffde8838 100644 |
| --- a/base/trace_event/memory_dump_manager_unittest.cc |
| +++ b/base/trace_event/memory_dump_manager_unittest.cc |
| @@ -370,21 +370,21 @@ TEST_F(MemoryDumpManagerTest, RespectTaskRunnerAffinity) { |
| InitializeMemoryDumpManager(false /* is_coordinator */); |
| const uint32 kNumInitialThreads = 8; |
| - ScopedVector<Thread> threads; |
| - ScopedVector<MockMemoryDumpProvider> mdps; |
| + std::vector<scoped_ptr<Thread>> threads; |
| + std::vector<scoped_ptr<MockMemoryDumpProvider>> mdps; |
| // Create the threads and setup the expectations. Given that at each iteration |
| // we will pop out one thread/MemoryDumpProvider, each MDP is supposed to be |
| // invoked a number of times equal to its index. |
| for (uint32 i = kNumInitialThreads; i > 0; --i) { |
| - Thread* thread = new Thread("test thread"); |
| - threads.push_back(thread); |
| + threads.push_back(make_scoped_ptr(new Thread("test thread"))); |
|
Primiano Tucci (use gerrit)
2015/11/26 15:38:02
I honestly did prefer keeping these as separate li
|
| threads.back()->Start(); |
| - scoped_refptr<SingleThreadTaskRunner> task_runner = thread->task_runner(); |
| - MockMemoryDumpProvider* mdp = new MockMemoryDumpProvider(); |
| - mdps.push_back(mdp); |
| - RegisterDumpProvider(mdp, task_runner, kDefaultOptions); |
| - EXPECT_CALL(*mdp, OnMemoryDump(_, _)) |
| + scoped_refptr<SingleThreadTaskRunner> task_runner = |
| + threads.back()->task_runner(); |
| + scoped_ptr<MockMemoryDumpProvider> mdp(new MockMemoryDumpProvider()); |
| + mdps.push_back(make_scoped_ptr(new MockMemoryDumpProvider())); |
| + RegisterDumpProvider(mdps.back().get(), task_runner, kDefaultOptions); |
| + EXPECT_CALL(*(mdps.back()), OnMemoryDump(_, _)) |
| .Times(i) |
| .WillRepeatedly(Invoke( |
| [task_runner](const MemoryDumpArgs&, ProcessMemoryDump*) -> bool { |
| @@ -409,7 +409,7 @@ TEST_F(MemoryDumpManagerTest, RespectTaskRunnerAffinity) { |
| RunLoop run_loop; |
| Closure unregistration = |
| Bind(&MemoryDumpManager::UnregisterDumpProvider, |
| - Unretained(mdm_.get()), Unretained(mdps.back())); |
| + Unretained(mdm_.get()), Unretained(mdps.back().get())); |
| threads.back()->task_runner()->PostTaskAndReply(FROM_HERE, unregistration, |
| run_loop.QuitClosure()); |
| run_loop.Run(); |