Merge gpu_trace_event back into base/debug/trace_event

base/base.gypi

 # 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 385 matching lines @@
               '<(DEPTH)/third_party/wtl/include',
             ],
             'sources!': [
               'event_recorder_stubs.cc',
               'file_descriptor_shuffle.cc',
               'message_pump_libevent.cc',
               # Not using sha1_win.cc because it may have caused a
               # regression to page cycler moz.
               'sha1_win.cc',
               'string16.cc',
-              'debug/trace_event.cc',
             ],
           },],
           ['OS=="freebsd" or OS=="openbsd"', {
             'sources!': [
               'base/files/file_path_watcher_linux.cc',
             ],
             'sources': [
               'base/files/file_path_watcher_stub.cc',
             ],
           }],
@@ skipping 235 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }