Revert 237280 "Remove TraceController"

trunk/src/content/content_browser.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
     '../net/net.gyp:net',
@@ skipping 159 matching lines @@
     'public/browser/site_instance.h',
     'public/browser/speech_recognition_event_listener.h',
     'public/browser/speech_recognition_manager.h',
     'public/browser/speech_recognition_manager_delegate.h',
     'public/browser/speech_recognition_session_config.cc',
     'public/browser/speech_recognition_session_config.h',
     'public/browser/speech_recognition_session_context.cc',
     'public/browser/speech_recognition_session_context.h',
     'public/browser/storage_partition.h',
     'public/browser/stream_handle.h',
+    'public/browser/trace_controller.h',
+    'public/browser/trace_subscriber.h',
     'public/browser/tracing_controller.h',
     'public/browser/user_metrics.h',
     'public/browser/utility_process_host.h',
     'public/browser/web_contents.cc',
     'public/browser/web_contents.h',
     'public/browser/web_contents_delegate.cc',
     'public/browser/web_contents_delegate.h',
     'public/browser/web_contents_observer.cc',
     'public/browser/web_contents_observer.h',
     'public/browser/web_contents_user_data.h',
@@ skipping 959 matching lines @@
     'browser/storage_partition_impl.cc',
     'browser/storage_partition_impl.h',
     'browser/storage_partition_impl_map.cc',
     'browser/storage_partition_impl_map.h',
     'browser/system_message_window_win.cc',
     'browser/system_message_window_win.h',
     'browser/tcmalloc_internals_request_job.cc',
     'browser/tcmalloc_internals_request_job.h',
     'browser/theme_helper_mac.mm',
     'browser/theme_helper_mac.h',
+    'browser/tracing/trace_controller_impl.cc',
+    'browser/tracing/trace_controller_impl.h',
     'browser/tracing/trace_message_filter.cc',
     'browser/tracing/trace_message_filter.h',
+    'browser/tracing/trace_subscriber_stdio.cc',
+    'browser/tracing/trace_subscriber_stdio.h',
     'browser/tracing/tracing_controller_impl.cc',
     'browser/tracing/tracing_controller_impl.h',
     'browser/tracing/tracing_ui.cc',
     'browser/tracing/tracing_ui.h',
     'browser/udev_linux.cc',
     'browser/udev_linux.h',
     'browser/user_metrics.cc',
     'browser/utility_process_host_impl.cc',
     'browser/utility_process_host_impl.h',
     'browser/vibration/vibration_message_filter.cc',
@@ skipping 450 matching lines @@
         '../build/linux/system.gyp:dbus',
         '../dbus/dbus.gyp:dbus',
       ],
     }, {  # OS != "linux" or use_dbus==0
       'sources!': [
         'browser/geolocation/wifi_data_provider_linux.cc',
       ],
     }],
   ],
 }