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

content/browser/tracing/tracing_controller_impl.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include "content/browser/tracing/tracing_controller_impl.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 49 matching lines @@
 #include "content/browser/tracing/etw_tracing_agent_win.h"
 #endif
 
 using base::trace_event::TraceLog;
 using base::trace_event::TraceConfig;
 
 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;
 const int kIssueClockSyncTimeoutSeconds = 30;
 const int kStopTracingRetryTimeMilliseconds = 100;
 
 std::string GetNetworkTypeString() {
   switch (net::NetworkChangeNotifier::GetConnectionType()) {
     case net::NetworkChangeNotifier::CONNECTION_ETHERNET:
       return "Ethernet";
@@ skipping 53 matching lines @@
   // Deliberately leaked, like this class.
   base::FileTracing::SetProvider(new FileTracingProviderImpl);
 }
 
 TracingControllerImpl::~TracingControllerImpl() {
   // This is a Leaky instance.
   NOTREACHED();
 }
 
 TracingControllerImpl* TracingControllerImpl::GetInstance() {
-  return g_controller.Pointer();
+  return g_tracing_controller.Pointer();
 }
 
 bool TracingControllerImpl::GetCategories(
     const GetCategoriesDoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Known categories come back from child processes with the EndTracingAck
   // message. So to get known categories, just begin and end tracing immediately
   // afterwards. This will ping all the child processes for categories.
   pending_get_categories_done_callback_ = callback;
@@ skipping 307 matching lines @@
 #if defined(OS_CHROMEOS)
   auto* debug_daemon =
       chromeos::DBusThreadManager::Get()->GetDebugDaemonClient();
   if (agent_name == debug_daemon->GetTracingAgentName()) {
     additional_tracing_agents_.push_back(debug_daemon);
     debug_daemon->SetStopAgentTracingTaskRunner(
         BrowserThread::GetBlockingPool());
     return;
   }
 
-  if (agent_name == kArcTracingAgentName) {
+  if (agent_name == kArcTracingAgentNameCopy) {
     additional_tracing_agents_.push_back(ArcTracingAgent::GetInstance());
     return;
   }
 #elif defined(OS_WIN)
   auto* etw_agent = EtwTracingAgent::GetInstance();
   if (agent_name == etw_agent->GetTracingAgentName()) {
     additional_tracing_agents_.push_back(etw_agent);
     return;
   }
 #endif
@@ skipping 87 matching lines @@
 }
 
 void TracingControllerImpl::OnEndAgentTracingAcked(
     const std::string& agent_name,
     const std::string& events_label,
     const scoped_refptr<base::RefCountedString>& events_str_ptr) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   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());
     } else {
       trace_data_sink_->AddAgentTrace(
           events_label, base::GetQuotedJSONString(events_str_ptr->data()));
     }
   }
   std::vector<std::string> category_groups;
   OnStopTracingAcked(NULL, category_groups);
@@ skipping 302 matching lines @@
   base::Time::Now().UTCExplode(&ctime);
   std::string time_string = base::StringPrintf(
       "%u-%u-%u %d:%d:%d", ctime.year, ctime.month, ctime.day_of_month,
       ctime.hour, ctime.minute, ctime.second);
   metadata_dict->SetString("trace-capture-datetime", time_string);
 
   return metadata_dict;
 }
 
 }  // namespace content