Update from https://crrev.com/314320

cc/debug/frame_timing_tracker_unittest.cc

 // Copyright 2015 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 <string>
 
-#include "base/debug/trace_event_argument.h"
 #include "base/time/time.h"
+#include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
 #include "cc/debug/frame_timing_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 static std::string ToString(
     scoped_ptr<FrameTimingTracker::CompositeTimingSet> timingset) {
   scoped_refptr<base::debug::TracedValue> value =
@@ skipping 97 matching lines @@
                 "{\"frame_id\":2,\"timestamp\":100},"
                 "{\"frame_id\":1,\"timestamp\":200}],\"rect_id\":3}"));
   EXPECT_NE(std::string::npos,
             result.find(
                 "{\"events\":["
                 "{\"frame_id\":3,\"timestamp\":100}],\"rect_id\":4}"));
 }
 
 }  // namespace
 }  // namespace cc