Update from https://crrev.com/316786

cc/debug/devtools_instrumentation.h

 // 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.
 
 #ifndef CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
 #define CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
 
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 
@@ skipping 78 matching lines @@
   }
   ~ScopedCommitTrace() {
     TRACE_EVENT_END0(internal::kCategory, internal::kCompositeLayers);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedCommitTrace);
 };
 
 struct ScopedLayerObjectTracker
-    : public base::debug::TraceScopedTrackableObject<int> {
+    : public base::trace_event::TraceScopedTrackableObject<int> {
   explicit ScopedLayerObjectTracker(int layer_id)
-      : base::debug::TraceScopedTrackableObject<int>(
+      : base::trace_event::TraceScopedTrackableObject<int>(
             internal::kCategory,
             internal::kLayerId,
             layer_id) {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedLayerObjectTracker);
 };
 
 inline void DidActivateLayerTree(int layer_tree_host_id, int frame_id) {
@@ skipping 23 matching lines @@
 }
 
 inline void DidRequestMainThreadFrame(int layer_tree_host_id) {
   TRACE_EVENT_INSTANT1(internal::kCategoryFrame,
                        internal::kRequestMainThreadFrame,
                        TRACE_EVENT_SCOPE_THREAD,
                        internal::kLayerTreeId,
                        layer_tree_host_id);
 }
 
-inline scoped_refptr<base::debug::ConvertableToTraceFormat>
+inline scoped_refptr<base::trace_event::ConvertableToTraceFormat>
 BeginMainThreadFrameData(int frame_id) {
-  scoped_refptr<base::debug::TracedValue> value =
-      new base::debug::TracedValue();
+  scoped_refptr<base::trace_event::TracedValue> value =
+      new base::trace_event::TracedValue();
   value->SetInteger("frameId", frame_id);
   return value;
 }
 
 inline void WillBeginMainThreadFrame(int layer_tree_host_id, int frame_id) {
   TRACE_EVENT_INSTANT2(
       internal::kCategoryFrame, internal::kBeginMainThreadFrame,
       TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id,
       internal::kData, BeginMainThreadFrameData(frame_id));
 }
 
 }  // namespace devtools_instrumentation
 }  // namespace cc
 
 #endif  // CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_