Snapshot of all changes to get jumbo in blink and content.

content/browser/tracing/tracing_controller_impl.cc

Index: content/browser/tracing/tracing_controller_impl.cc
diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc
index 59b81fe7b42fd39490579fadef7f97225150246c..324b03354598e6503905d9a3b37c05e0c67d3274 100644
--- a/content/browser/tracing/tracing_controller_impl.cc
+++ b/content/browser/tracing/tracing_controller_impl.cc
@@ -66,12 +66,12 @@ namespace content {
 
 namespace {
 
-base::LazyInstance<TracingControllerImpl>::Leaky g_controller =
+base::LazyInstance<TracingControllerImpl>::Leaky g_tracing_controller =
     LAZY_INSTANCE_INITIALIZER;
 
 const char kChromeTracingAgentName[] = "chrome";
-const char kETWTracingAgentName[] = "etw";
-const char kArcTracingAgentName[] = "arc";
+const char kETWTracingAgentNameCopy[] = "etw";
+const char kArcTracingAgentNameCopy[] = "arc";
 const char kChromeTraceLabel[] = "traceEvents";
 
 const int kStartTracingTimeoutSeconds = 30;
@@ -145,7 +145,7 @@ TracingControllerImpl::~TracingControllerImpl() {
 }
 
 TracingControllerImpl* TracingControllerImpl::GetInstance() {
-  return g_controller.Pointer();
+  return g_tracing_controller.Pointer();
 }
 
 bool TracingControllerImpl::GetCategories(
@@ -461,7 +461,7 @@ void TracingControllerImpl::AddTracingAgent(const std::string& agent_name) {
     return;
   }
 
-  if (agent_name == kArcTracingAgentName) {
+  if (agent_name == kArcTracingAgentNameCopy) {
     additional_tracing_agents_.push_back(ArcTracingAgent::GetInstance());
     return;
   }
@@ -569,11 +569,11 @@ void TracingControllerImpl::OnEndAgentTracingAcked(
 
   if (trace_data_sink_.get() && events_str_ptr &&
       !events_str_ptr->data().empty()) {
-    if (agent_name == kETWTracingAgentName) {
+    if (agent_name == kETWTracingAgentNameCopy) {
       // The Windows kernel events are kept into a JSON format stored as string
       // and must not be escaped.
       trace_data_sink_->AddAgentTrace(events_label, events_str_ptr->data());
-    } else if (agent_name == kArcTracingAgentName) {
+    } else if (agent_name == kArcTracingAgentNameCopy) {
       // The ARC events are kept into a JSON format stored as string
       // and must not be escaped.
       trace_data_sink_->AddTraceChunk(events_str_ptr->data());