Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

gpu/command_buffer/service/gpu_tracer.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/gpu_tracer.h"
 
 #include <deque>
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
@@ skipping 33 matching lines @@
   named_thread_.Stop();
 }
 
 TraceOutputter::~TraceOutputter() { g_outputter_thread = NULL; }
 
 void TraceOutputter::TraceDevice(const std::string& category,
                                  const std::string& name,
                                  int64 start_time,
                                  int64 end_time) {
   TRACE_EVENT_COPY_BEGIN_WITH_ID_TID_AND_TIMESTAMP1(
-      TRACE_DISABLED_BY_DEFAULT("gpu.device"),
-      name.c_str(),
-      local_trace_id_,
-      named_thread_.thread_id(),
-      start_time,
-      "gl_category",
-      category.c_str());
+      TRACE_DISABLED_BY_DEFAULT("gpu.device"), name.c_str(), local_trace_id_,
+      named_thread_.GetThreadId(), start_time, "gl_category", category.c_str());
   TRACE_EVENT_COPY_END_WITH_ID_TID_AND_TIMESTAMP1(
-      TRACE_DISABLED_BY_DEFAULT("gpu.device"),
-      name.c_str(),
-      local_trace_id_,
-      named_thread_.thread_id(),
-      end_time,
-      "gl_category",
-      category.c_str());
+      TRACE_DISABLED_BY_DEFAULT("gpu.device"), name.c_str(), local_trace_id_,
+      named_thread_.GetThreadId(), end_time, "gl_category", category.c_str());
   ++local_trace_id_;
 }
 
 void TraceOutputter::TraceServiceBegin(const std::string& category,
                                        const std::string& name) {
   TRACE_EVENT_COPY_BEGIN1(TRACE_DISABLED_BY_DEFAULT("gpu.service"),
                           name.c_str(), "gl_category", category.c_str());
 }
 
 void TraceOutputter::TraceServiceEnd(const std::string& category,
@@ skipping 289 matching lines @@
 void GPUTracer::IssueProcessTask() {
   if (finished_traces_.empty() || process_posted_)
     return;
 
   process_posted_ = true;
   PostTask();
 }
 
 }  // namespace gles2
 }  // namespace gpu