Merge gpu_trace_event back into base/debug/trace_event

gpu/gpu.gyp

Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 39158771003ef0cbc5805ab80481f1a71c657d42..4acf68322a10b313ba7eaefc0942f6307d35b97e 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -25,20 +25,6 @@
   },
   'targets': [
     {
-      'target_name': 'gpu_common',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'common/gpu_trace_event.cc',
-        'common/gpu_trace_event.h',
-      ],
-    },
-    {
       'target_name': 'command_buffer_common',
       'type': 'static_library',
       'include_dirs': [
@@ -160,7 +146,6 @@
       },
       'dependencies': [
         'command_buffer_common',
-        'gpu_common',
       ],
       'sources': [
         'command_buffer/client/cmd_buffer_helper.cc',
@@ -186,7 +171,6 @@
       },
       'dependencies': [
         'command_buffer_common',
-        'gpu_common',
         '../base/base.gyp:base',
         '../ui/gfx/gl/gl.gyp:gl',
         '../ui/gfx/surface/surface.gyp:surface',
@@ -257,7 +241,6 @@
         'command_buffer_client',
         'command_buffer_common',
         'command_buffer_service',
-        'gpu_common',
         'gpu_unittest_utils',
         'gles2_implementation_client_side_arrays',
         'gles2_cmd_helper',