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

content/browser/tracing/tracing_controller_impl_data_sinks.cc

 // Copyright 2015 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 <utility>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/pattern.h"
 #include "content/browser/tracing/tracing_controller_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/zlib/zlib.h"
 
 namespace content {
 
 namespace {
 
-const char kChromeTraceLabel[] = "traceEvents";
+const char kChromeTraceLabelStr[] = "traceEvents";
 const char kMetadataTraceLabel[] = "metadata";
 
 class StringTraceDataEndpoint : public TraceDataEndpoint {
  public:
   typedef base::Callback<void(std::unique_ptr<const base::DictionaryValue>,
                               base::RefCountedString*)>
       CompletionCallback;
 
   explicit StringTraceDataEndpoint(CompletionCallback callback)
       : completion_callback_(callback) {}
@@ skipping 112 matching lines @@
 class JSONTraceDataSink : public TraceDataSinkImplBase {
  public:
   explicit JSONTraceDataSink(scoped_refptr<TraceDataEndpoint> endpoint)
       : endpoint_(endpoint), had_received_first_chunk_(false) {}
 
   void AddTraceChunk(const std::string& chunk) override {
     std::string trace_string;
     if (had_received_first_chunk_)
       trace_string = ",";
     else
-      trace_string = "{\"" + std::string(kChromeTraceLabel) + "\":[";
+      trace_string = "{\"" + std::string(kChromeTraceLabelStr) + "\":[";
     trace_string += chunk;
     had_received_first_chunk_ = true;
 
     endpoint_->ReceiveTraceChunk(base::MakeUnique<std::string>(trace_string));
   }
 
   void Close() override {
     endpoint_->ReceiveTraceChunk(base::MakeUnique<std::string>("]"));
 
     for (auto const &it : GetAgentTrace())
@@ skipping 173 matching lines @@
   return new StringTraceDataEndpoint(callback);
 }
 
 scoped_refptr<TracingController::TraceDataSink>
 TracingControllerImpl::CreateJSONSink(
     scoped_refptr<TraceDataEndpoint> endpoint) {
   return new JSONTraceDataSink(endpoint);
 }
 
 }  // namespace content