Update from https://crrev.com/316786

cc/quads/list_container_unittest.cc

 // Copyright 2014 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/quads/list_container.h"
 
 #include <vector>
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/largest_draw_quad.h"
 #include "cc/quads/render_pass_draw_quad.h"
@@ skipping 16 matching lines @@
   return false;
 }
 
 class SimpleDrawQuad : public DrawQuad {
  public:
   ~SimpleDrawQuad() override {}
   void IterateResources(const ResourceIteratorCallback& callback) override {}
 
   void set_value(int val) { value = val; }
   int get_value() { return value; }
-  void ExtendValue(base::debug::TracedValue* value) const override {}
+  void ExtendValue(base::trace_event::TracedValue* value) const override {}
 
  private:
   int value;
 };
 
 class SimpleDrawQuadConstructMagicNumberOne : public SimpleDrawQuad {
  public:
   SimpleDrawQuadConstructMagicNumberOne() : SimpleDrawQuad() {
     set_value(kMagicNumberToUseForDrawQuadOne);
   }
 };
 
 class SimpleDrawQuadConstructMagicNumberTwo : public SimpleDrawQuad {
  public:
   SimpleDrawQuadConstructMagicNumberTwo() : SimpleDrawQuad() {
     set_value(kMagicNumberToUseForDrawQuadTwo);
   }
 };
 
 class MockDrawQuad : public DrawQuad {
  public:
   ~MockDrawQuad() override { Destruct(); }
   void IterateResources(const ResourceIteratorCallback& callback) override {}
-  void ExtendValue(base::debug::TracedValue* value) const override {}
+  void ExtendValue(base::trace_event::TracedValue* value) const override {}
   MOCK_METHOD0(Destruct, void());
 };
 
 TEST(ListContainerTest, ConstructorCalledInAllocateAndConstruct) {
   ListContainer<DrawQuad> list(LargestDrawQuadSize());
 
   size_t size = 2;
   SimpleDrawQuadConstructMagicNumberOne* dq_1 =
       list.AllocateAndConstruct<SimpleDrawQuadConstructMagicNumberOne>();
   SimpleDrawQuadConstructMagicNumberTwo* dq_2 =
@@ skipping 473 matching lines @@
   for (ListContainer<SharedQuadState>::ReverseIterator iter = list.rbegin();
        iter != list.rend();
        ++iter) {
     EXPECT_EQ(i, iter.index());
     ++i;
   }
 }
 
 }  // namespace
 }  // namespace cc