Update from https://crrev.com/316786

cc/quads/shared_quad_state.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_QUADS_SHARED_QUAD_STATE_H_
 #define CC_QUADS_SHARED_QUAD_STATE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/transform.h"
 
 namespace base {
 namespace trace_event {
 class TracedValue;
 }
 class Value;
-
-// 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 {
 
 // SharedQuadState holds a set of properties that are common across multiple
 // DrawQuads. It's purely an optimization - the properties behave in exactly the
 // same way as if they were replicated on each DrawQuad. A given SharedQuadState
 // can only be shared by DrawQuads that are adjacent in their RenderPass'
 // QuadList.
 class CC_EXPORT SharedQuadState {
  public:
   SharedQuadState();
   ~SharedQuadState();
 
   void CopyFrom(const SharedQuadState* other);
 
   void SetAll(const gfx::Transform& content_to_target_transform,
               const gfx::Size& content_bounds,
               const gfx::Rect& visible_content_rect,
               const gfx::Rect& clip_rect,
               bool is_clipped,
               float opacity,
               SkXfermode::Mode blend_mode,
               int sorting_context_id);
-  void AsValueInto(base::debug::TracedValue* dict) const;
+  void AsValueInto(base::trace_event::TracedValue* dict) const;
 
   // Transforms from quad's original content space to its target content space.
   gfx::Transform content_to_target_transform;
   // This size lives in the content space for the quad's originating layer.
   gfx::Size content_bounds;
   // This rect lives in the content space for the quad's originating layer.
   gfx::Rect visible_content_rect;
   // This rect lives in the target content space.
   gfx::Rect clip_rect;
   bool is_clipped;
   float opacity;
   SkXfermode::Mode blend_mode;
   int sorting_context_id;
 };
 
 }  // namespace cc
 
 #endif  // CC_QUADS_SHARED_QUAD_STATE_H_