Update from https://crrev.com/316786

cc/resources/tile_priority.cc

 // Copyright 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 "cc/resources/tile_priority.h"
 
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 
@@ skipping 30 matching lines @@
       return "NOW";
     case TilePriority::SOON:
       return "SOON";
     case TilePriority::EVENTUALLY:
       return "EVENTUALLY";
   }
   DCHECK(false) << "Unrecognized TilePriority::PriorityBin value " << bin;
   return "<unknown TilePriority::PriorityBin value>";
 }
 
-void TilePriority::AsValueInto(base::debug::TracedValue* state) const {
+void TilePriority::AsValueInto(base::trace_event::TracedValue* state) const {
   state->SetString("resolution", TileResolutionToString(resolution));
   state->SetString("priority_bin", TilePriorityBinToString(priority_bin));
   state->SetDouble("distance_to_visible",
                    MathUtil::AsDoubleSafely(distance_to_visible));
 }
 
 std::string TileMemoryLimitPolicyToString(TileMemoryLimitPolicy policy) {
   switch (policy) {
   case ALLOW_NOTHING:
     return "ALLOW_NOTHING";
@@ skipping 17 matching lines @@
     return "SMOOTHNESS_TAKES_PRIORITY";
   case NEW_CONTENT_TAKES_PRIORITY:
     return "NEW_CONTENT_TAKES_PRIORITY";
   default:
     DCHECK(false) << "Unrecognized priority value " << prio;
     return "<unknown>";
   }
 }
 
 void GlobalStateThatImpactsTilePriority::AsValueInto(
-    base::debug::TracedValue* state) const {
+    base::trace_event::TracedValue* state) const {
   state->SetString("memory_limit_policy",
                    TileMemoryLimitPolicyToString(memory_limit_policy));
   state->SetInteger("soft_memory_limit_in_bytes", soft_memory_limit_in_bytes);
   state->SetInteger("hard_memory_limit_in_bytes", hard_memory_limit_in_bytes);
   state->SetInteger("num_resources_limit", num_resources_limit);
   state->SetString("tree_priority", TreePriorityToString(tree_priority));
 }
 
 }  // namespace cc