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

Unified Diff: content/browser/browser_main_loop.cc

Issue 9694028: Add a Content API around TracingController. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix linux Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_main_loop.cc
===================================================================
--- content/browser/browser_main_loop.cc (revision 126271)
+++ content/browser/browser_main_loop.cc (working copy)
@@ -23,7 +23,7 @@
#include "content/browser/net/browser_online_state_observer.h"
#include "content/browser/plugin_service_impl.h"
#include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
-#include "content/browser/trace_controller.h"
+#include "content/browser/trace_controller_impl.h"
#include "content/common/hi_res_timer_manager.h"
#include "content/common/sandbox_policy.h"
#include "content/public/browser/browser_main_parts.h"
@@ -86,6 +86,8 @@
#undef DestroyAll
#endif
+using content::TraceControllerImpl;
+
namespace {
#if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -323,8 +325,10 @@
InitializeMainThread();
// Start tracing to a file if needed.
- if (base::debug::TraceLog::GetInstance()->IsEnabled())
- TraceController::GetInstance()->InitStartupTracing(parsed_command_line_);
+ if (base::debug::TraceLog::GetInstance()->IsEnabled()) {
+ TraceControllerImpl::GetInstance()->InitStartupTracing(
+ parsed_command_line_);
+ }
system_monitor_.reset(new base::SystemMonitor);
hi_res_timer_manager_.reset(new HighResolutionTimerManager);

Powered by Google App Engine
This is Rietveld 408576698