Update from https://crrev.com/315085

mojo/common/trace_controller_impl.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 "mojo/common/trace_controller_impl.h"
 
-#include "base/debug/trace_event.h"
+#include "base/trace_event/trace_event.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_impl.h"
 
 namespace mojo {
 
 TraceControllerImpl::TraceControllerImpl(
     InterfaceRequest<tracing::TraceController> request)
     : binding_(this, request.Pass()) {
 }
 
@@ skipping 22 matching lines @@
 void TraceControllerImpl::SendChunk(
     const scoped_refptr<base::RefCountedString>& events_str,
     bool has_more_events) {
   collector_->DataCollected(mojo::String(events_str->data()));
   if (!has_more_events) {
     collector_.reset();
   }
 }
 
 }  // namespace mojo