Update from https://crrev.com/316786

cc/resources/picture_layer_tiling_set.h

 // 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.
 
 #ifndef CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
 #define CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
 
 #include <set>
 #include <vector>
 
 #include "cc/base/region.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/resources/picture_layer_tiling.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace base {
 namespace trace_event {
 class TracedValue;
 }
-
-// TODO(ssid): remove these aliases after the tracing clients are moved to the
-// new trace_event namespace. See crbug.com/451032. ETA: March 2015
-namespace debug {
-using ::base::trace_event::TracedValue;
 }
-}  // namespace base
 
 namespace cc {
 
 class CC_EXPORT PictureLayerTilingSet {
  public:
   enum TilingRangeType {
     HIGHER_THAN_HIGH_RES,
     HIGH_RES,
     BETWEEN_HIGH_AND_LOW_RES,
     LOW_RES,
@@ skipping 113 matching lines @@
     float ideal_contents_scale_;
     PictureLayerTiling::CoverageIterator tiling_iter_;
     int current_tiling_;
     int ideal_tiling_;
 
     Region current_region_;
     Region missing_region_;
     Region::Iterator region_iter_;
   };
 
-  void AsValueInto(base::debug::TracedValue* array) const;
+  void AsValueInto(base::trace_event::TracedValue* array) const;
   size_t GPUMemoryUsageInBytes() const;
 
   TilingRange GetTilingRange(TilingRangeType type) const;
 
  private:
   explicit PictureLayerTilingSet(
       PictureLayerTilingClient* client,
       size_t max_tiles_for_interest_area,
       float skewport_target_time_in_seconds,
       int skewport_extrapolation_limit_in_content_pixels);
 
   // Remove one tiling.
   void Remove(PictureLayerTiling* tiling);
 
   ScopedPtrVector<PictureLayerTiling> tilings_;
 
   const size_t max_tiles_for_interest_area_;
   const float skewport_target_time_in_seconds_;
   const int skewport_extrapolation_limit_in_content_pixels_;
   PictureLayerTilingClient* client_;
 
   friend class Iterator;
   DISALLOW_COPY_AND_ASSIGN(PictureLayerTilingSet);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_