Update from https://crrev.com/316786

gpu/command_buffer/service/gpu_state_tracer.cc

 // Copyright 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 "gpu/command_buffer/service/gpu_state_tracer.h"
 
 #include "base/base64.h"
 #include "base/trace_event/trace_event.h"
 #include "context_state.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace gpu {
 namespace gles2 {
 namespace {
 
 const int kBytesPerPixel = 4;
 
-class Snapshot : public base::debug::ConvertableToTraceFormat {
+class Snapshot : public base::trace_event::ConvertableToTraceFormat {
  public:
   static scoped_refptr<Snapshot> Create(const ContextState* state);
 
   // Save a screenshot of the currently bound framebuffer.
   bool SaveScreenshot(const gfx::Size& size);
 
-  // base::debug::ConvertableToTraceFormat implementation.
+  // base::trace_event::ConvertableToTraceFormat implementation.
   void AppendAsTraceFormat(std::string* out) const override;
 
  private:
   explicit Snapshot(const ContextState* state);
   ~Snapshot() override {}
 
   const ContextState* state_;
 
   std::vector<unsigned char> screenshot_pixels_;
   gfx::Size screenshot_size_;
@@ skipping 81 matching lines @@
   scoped_refptr<Snapshot> snapshot(Snapshot::Create(state_));
 
   // Only save a screenshot for now.
   if (!snapshot->SaveScreenshot(size))
     return;
 
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("gpu.debug"),
       "gpu::State",
       state_,
-      scoped_refptr<base::debug::ConvertableToTraceFormat>(snapshot));
+      scoped_refptr<base::trace_event::ConvertableToTraceFormat>(snapshot));
 }
 
 }  // namespace gles2
 }  // namespace gpu