Update from https://crrev.com/314320

cc/test/test_now_source.h

 // 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.
 
 #ifndef CC_TEST_TEST_NOW_SOURCE_H_
 #define CC_TEST_TEST_NOW_SOURCE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/debug/trace_event.h"
-#include "base/debug/trace_event_argument.h"
 #include "base/logging.h"
+#include "base/trace_event/trace_event.h"
+#include "base/trace_event/trace_event_argument.h"
 
 namespace cc {
 
 class TestNowSource : public base::RefCounted<TestNowSource> {
  public:
   static scoped_refptr<TestNowSource> Create();
   static scoped_refptr<TestNowSource> Create(int64_t initial);
   static scoped_refptr<TestNowSource> Create(base::TimeTicks initial);
 
   virtual void Reset();
@@ skipping 27 matching lines @@
 };
 
 // gtest pretty printing functions
 void PrintTo(const scoped_refptr<TestNowSource>& src, ::std::ostream* os);
 ::std::ostream& operator<<(::std::ostream& os,
                            const scoped_refptr<TestNowSource>& src);
 
 }  // namespace cc
 
 #endif  // CC_TEST_TEST_NOW_SOURCE_H_