Update from https://crrev.com/308996

cc/debug/frame_viewer_instrumentation.h

Index: cc/debug/frame_viewer_instrumentation.h
diff --git a/cc/debug/frame_viewer_instrumentation.h b/cc/debug/frame_viewer_instrumentation.h
index e0e54eb3cb801dc33ee1744e5545ba405327068b..76d1e4b00a843a3f206f30ff8071bec5d521eb23 100644
--- a/cc/debug/frame_viewer_instrumentation.h
+++ b/cc/debug/frame_viewer_instrumentation.h
@@ -10,50 +10,14 @@
 
 namespace cc {
 namespace frame_viewer_instrumentation {
-namespace internal {
-
-const char kCategory[] = "cc";
-const char kTileData[] = "tileData";
-const char kLayerId[] = "layerId";
-const char kTileId[] = "tileId";
-const char kTileResolution[] = "tileResolution";
-const char kSourceFrameNumber[] = "sourceFrameNumber";
-
-const char kAnalyzeTask[] = "AnalyzeTask";
-const char kRasterTask[] = "RasterTask";
-
-scoped_refptr<base::debug::ConvertableToTraceFormat> TileDataAsValue(
-    const void* tile_id,
-    TileResolution tile_resolution,
-    int source_frame_number,
-    int layer_id) {
-  scoped_refptr<base::debug::TracedValue> res(new base::debug::TracedValue());
-  TracedValue::SetIDRef(tile_id, res.get(), internal::kTileId);
-  res->SetString(internal::kTileResolution,
-                 TileResolutionToString(tile_resolution));
-  res->SetInteger(internal::kSourceFrameNumber, source_frame_number);
-  res->SetInteger(internal::kLayerId, layer_id);
-  return res;
-}
-
-}  // namespace internal
 
 class ScopedAnalyzeTask {
  public:
   ScopedAnalyzeTask(const void* tile_id,
                     TileResolution tile_resolution,
                     int source_frame_number,
-                    int layer_id) {
-    TRACE_EVENT_BEGIN1(
-        internal::kCategory,
-        internal::kAnalyzeTask,
-        internal::kTileData,
-        internal::TileDataAsValue(
-            tile_id, tile_resolution, source_frame_number, layer_id));
-  }
-  ~ScopedAnalyzeTask() {
-    TRACE_EVENT_END0(internal::kCategory, internal::kAnalyzeTask);
-  }
+                    int layer_id);
+  ~ScopedAnalyzeTask();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedAnalyzeTask);
@@ -64,17 +28,8 @@ class ScopedRasterTask {
   ScopedRasterTask(const void* tile_id,
                    TileResolution tile_resolution,
                    int source_frame_number,
-                   int layer_id) {
-    TRACE_EVENT_BEGIN1(
-        internal::kCategory,
-        internal::kRasterTask,
-        internal::kTileData,
-        internal::TileDataAsValue(
-            tile_id, tile_resolution, source_frame_number, layer_id));
-  }
-  ~ScopedRasterTask() {
-    TRACE_EVENT_END0(internal::kCategory, internal::kRasterTask);
-  }
+                   int layer_id);
+  ~ScopedRasterTask();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedRasterTask);