Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: content/browser/tracing/memory_tracing_browsertest.cc

Issue 1333873002: [tracing] Fix MemoryDumpManager to support startup tracing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re dsinclair #5 (nits, invert Initialize args) Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/tracing/tracing_controller_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/thread_task_runner_handle.h" 8 #include "base/thread_task_runner_handle.h"
9 #include "base/trace_event/memory_dump_manager.h" 9 #include "base/trace_event/memory_dump_manager.h"
10 #include "base/trace_event/memory_dump_provider.h" 10 #include "base/trace_event/memory_dump_provider.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 last_callback_dump_guid_ = dump_guid; 61 last_callback_dump_guid_ = dump_guid;
62 last_callback_success_ = success; 62 last_callback_success_ = success;
63 closure.Run(); 63 closure.Run();
64 } 64 }
65 65
66 protected: 66 protected:
67 void SetUp() override { 67 void SetUp() override {
68 callback_call_count_ = 0; 68 callback_call_count_ = 0;
69 last_callback_dump_guid_ = 0; 69 last_callback_dump_guid_ = 0;
70 last_callback_success_ = false; 70 last_callback_success_ = false;
71 MemoryDumpManager::GetInstance()->Initialize(); 71
72 // TODO(primiano): This should be done via TraceConfig.
73 // See https://goo.gl/5Hj3o0.
74 MemoryDumpManager::GetInstance()->DisablePeriodicDumpsForTesting();
75
72 mock_dump_provider_.reset(new MockDumpProvider()); 76 mock_dump_provider_.reset(new MockDumpProvider());
73 MemoryDumpManager::GetInstance()->RegisterDumpProvider( 77 MemoryDumpManager::GetInstance()->RegisterDumpProvider(
74 mock_dump_provider_.get()); 78 mock_dump_provider_.get());
75 // TODO(primiano): This should be done via TraceConfig.
76 // See https://goo.gl/5Hj3o0.
77 MemoryDumpManager::GetInstance()->DisablePeriodicDumpsForTesting();
78 ContentBrowserTest::SetUp(); 79 ContentBrowserTest::SetUp();
79 } 80 }
80 81
81 void TearDown() override { 82 void TearDown() override {
82 MemoryDumpManager::GetInstance()->UnregisterDumpProvider( 83 MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
83 mock_dump_provider_.get()); 84 mock_dump_provider_.get());
84 mock_dump_provider_.reset(); 85 mock_dump_provider_.reset();
85 ContentBrowserTest::TearDown(); 86 ContentBrowserTest::TearDown();
86 } 87 }
87 88
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 213
213 EnableMemoryTracing(); 214 EnableMemoryTracing();
214 RequestGlobalDumpAndWait(false /* from_renderer_thread */); 215 RequestGlobalDumpAndWait(false /* from_renderer_thread */);
215 EXPECT_EQ(1u, callback_call_count_); 216 EXPECT_EQ(1u, callback_call_count_);
216 EXPECT_NE(0u, last_callback_dump_guid_); 217 EXPECT_NE(0u, last_callback_dump_guid_);
217 EXPECT_TRUE(last_callback_success_); 218 EXPECT_TRUE(last_callback_success_);
218 DisableTracing(); 219 DisableTracing();
219 } 220 }
220 221
221 } // namespace content 222 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/tracing/tracing_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698