Merge gpu_trace_event back into base/debug/trace_event

content/browser/gpu_process_host_ui_shim.cc

 // Copyright (c) 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 "content/browser/gpu_process_host_ui_shim.h"
 
 #include "base/command_line.h"
 #include "base/id_map.h"
+#include "base/debug/trace_event.h"
 #include "base/process_util.h"
 #include "chrome/browser/browser_process.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/gpu_data_manager.h"
 #include "content/browser/gpu_process_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/content_switches.h"
 #include "content/common/gpu/gpu_messages.h"
-#include "gpu/common/gpu_trace_event.h"
 
 #if defined(OS_LINUX)
 // These two #includes need to come after gpu_messages.h.
 #include <gdk/gdkwindow.h>  // NOLINT
 #include <gdk/gdkx.h>  // NOLINT
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/gtk_native_view_id_manager.h"
 #include "ui/gfx/size.h"
 #endif  // defined(OS_LINUX)
 namespace {
@@ skipping 290 matching lines @@
       params.window,
       params.surface_id,
       // Parameters needed to formulate an acknowledgment.
       params.renderer_id,
       params.route_id,
       host_id_,
       params.swap_buffers_count);
 }
 
 #endif