Update from https://crrev.com/316786

cc/scheduler/begin_frame_source_unittest.cc

 // Copyright 2011 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 <deque>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 46 matching lines @@
   SEND_BEGIN_FRAME(new_args, source, frame_time, deadline, interval);
 
 namespace cc {
 namespace {
 
 class MockBeginFrameObserver : public BeginFrameObserver {
  public:
   MOCK_METHOD1(OnBeginFrame, void(const BeginFrameArgs&));
   MOCK_CONST_METHOD0(LastUsedBeginFrameArgs, const BeginFrameArgs());
 
-  virtual void AsValueInto(base::debug::TracedValue* dict) const {
+  virtual void AsValueInto(base::trace_event::TracedValue* dict) const {
     dict->SetString("type", "MockBeginFrameObserver");
     dict->BeginDictionary("last_begin_frame_args");
     LastUsedBeginFrameArgs().AsValueInto(dict);
     dict->EndDictionary();
   }
 
   // A value different from the normal default returned by a BeginFrameObserver
   // so it is easiable traced back here.
   static const BeginFrameArgs kDefaultBeginFrameArgs;
 
@@ skipping 199 matching lines @@
   source.SetNeedsBeginFrames(true);
   EXPECT_TRUE(source.NeedsBeginFrames());
   source.SetNeedsBeginFrames(false);
   EXPECT_FALSE(source.NeedsBeginFrames());
 }
 
 class LoopingBeginFrameObserver : public BeginFrameObserverMixIn {
  public:
   BeginFrameSource* source_;
 
-  void AsValueInto(base::debug::TracedValue* dict) const override {
+  void AsValueInto(base::trace_event::TracedValue* dict) const override {
     dict->SetString("type", "LoopingBeginFrameObserver");
     dict->BeginDictionary("source");
     source_->AsValueInto(dict);
     dict->EndDictionary();
   }
 
  protected:
   // BeginFrameObserverMixIn
   bool OnBeginFrameMixInDelegate(const BeginFrameArgs& args) override {
     return true;
   }
 };
 
 TEST(BeginFrameSourceMixInTest, DetectAsValueIntoLoop) {
   LoopingBeginFrameObserver obs;
   FakeBeginFrameSource source;
 
   obs.source_ = &source;
   source.AddObserver(&obs);
 
-  scoped_refptr<base::debug::TracedValue> state =
-      new base::debug::TracedValue();
+  scoped_refptr<base::trace_event::TracedValue> state =
+      new base::trace_event::TracedValue();
   source.AsValueInto(state.get());
 }
 
 // BackToBackBeginFrameSource testing -----------------------------------------
 class TestBackToBackBeginFrameSource : public BackToBackBeginFrameSource {
  public:
   static scoped_ptr<TestBackToBackBeginFrameSource> Create(
       scoped_refptr<TestNowSource> now_src,
       base::SingleThreadTaskRunner* task_runner) {
     return make_scoped_ptr(
@@ skipping 446 matching lines @@
   mux_->SetActiveSource(source2_);
   SEND_BEGIN_FRAME_DROP(*source2_, 750, 1050, 300);
   SEND_BEGIN_FRAME_USED(*source2_, 1050, 1250, 300);
 
   mux_->SetActiveSource(source1_);
   SEND_BEGIN_FRAME_DROP(*source2_, 1100, 1400, 300);
 }
 
 }  // namespace
 }  // namespace cc