Move tracing component to src/components

BUG=167317
COLLABORATOR=joi@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11624021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174716 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 40 insertions, 38 deletions

diff --git a/components/OWNERS b/components/OWNERS
index 4975363..4cc56a9 100644
--- a/components/OWNERS
+++ b/components/OWNERS
@@ -1 +1,4 @@
 joi@chromium.org
+
+per-file components_tracing*=jbauman@chromium.org
+per-file components_tracing*=nduca@chromium.org
diff --git a/content/content_components_tracing.gyp b/components/components_tracing.gyp
index c9537b1..f11c823 100644
--- a/content/content_components_tracing.gyp
+++ b/components/components_tracing.gyp
@@ -17,10 +17,10 @@
         '..',
       ],
       'sources': [
-        'components/tracing/child_trace_message_filter.cc',
-        'components/tracing/child_trace_message_filter.h',
-        'components/tracing/tracing_messages.cc',
-        'components/tracing/tracing_messages.h',
+        'tracing/child_trace_message_filter.cc',
+        'tracing/child_trace_message_filter.h',
+        'tracing/tracing_messages.cc',
+        'tracing/tracing_messages.h',
       ],
     },
   ],
diff --git a/content/content_components_tracing_untrusted.gyp b/components/components_tracing_untrusted.gyp
index 701d9f3..ff3e720 100644
--- a/content/content_components_tracing_untrusted.gyp
+++ b/components/components_tracing_untrusted.gyp
@@ -29,10 +29,10 @@
             'build_newlib': 1,
           },
           'sources': [
-            'components/tracing/child_trace_message_filter.cc',
-            'components/tracing/child_trace_message_filter.h',
-            'components/tracing/tracing_messages.cc',
-            'components/tracing/tracing_messages.h',
+            'tracing/child_trace_message_filter.cc',
+            'tracing/child_trace_message_filter.h',
+            'tracing/tracing_messages.cc',
+            'tracing/tracing_messages.h',
           ],
         },
       ],
diff --git a/content/components/tracing/DEPS b/components/tracing/DEPS
index 7330946..bd05a3e 100644
--- a/content/components/tracing/DEPS
+++ b/components/tracing/DEPS
@@ -3,7 +3,6 @@ include_rules = [
   "+ipc",
 
   # This component will be compiled into NaCl, so it shouldn't depend on
-  # anything else in content.
+  # anything in content.
   "-content",
-  "+content/components/tracing",
 ]
diff --git a/content/components/tracing/OWNERS b/components/tracing/OWNERS
index ba7dc1b..ba7dc1b 100644
--- a/content/components/tracing/OWNERS
+++ b/components/tracing/OWNERS
diff --git a/content/components/tracing/child_trace_message_filter.cc b/components/tracing/child_trace_message_filter.cc
index 453a976..161c778 100644
--- a/content/components/tracing/child_trace_message_filter.cc
+++ b/components/tracing/child_trace_message_filter.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/components/tracing/child_trace_message_filter.h"
+#include "components/tracing/child_trace_message_filter.h"
 
 #include "base/debug/trace_event.h"
 #include "base/message_loop_proxy.h"
-#include "content/components/tracing/tracing_messages.h"
+#include "components/tracing/tracing_messages.h"
 
 using base::debug::TraceLog;
 
-namespace content {
+namespace components {
 
 ChildTraceMessageFilter::ChildTraceMessageFilter(
     base::MessageLoopProxy* ipc_message_loop)
@@ -114,4 +114,4 @@ void ChildTraceMessageFilter::OnTraceNotification(int notification) {
   channel_->Send(new TracingHostMsg_TraceNotification(notification));
 }
 
-}  // namespace content
+}  // namespace components
diff --git a/content/components/tracing/child_trace_message_filter.h b/components/tracing/child_trace_message_filter.h
index c6a72e2..e4802ba 100644
--- a/content/components/tracing/child_trace_message_filter.h
+++ b/components/tracing/child_trace_message_filter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMPONENTS_TRACING_CHILD_TRACE_MESSAGE_FILTER_H_
-#define CONTENT_COMPONENTS_TRACING_CHILD_TRACE_MESSAGE_FILTER_H_
+#ifndef COMPONENTS_TRACING_CHILD_TRACE_MESSAGE_FILTER_H_
+#define COMPONENTS_TRACING_CHILD_TRACE_MESSAGE_FILTER_H_
 
 #include "ipc/ipc_channel_proxy.h"
 
@@ -11,7 +11,7 @@ namespace base {
 class MessageLoopProxy;
 }
 
-namespace content {
+namespace components {
 
 // This class sends and receives trace messages on child processes.
 class ChildTraceMessageFilter : public IPC::ChannelProxy::MessageFilter {
@@ -48,6 +48,6 @@ class ChildTraceMessageFilter : public IPC::ChannelProxy::MessageFilter {
   DISALLOW_COPY_AND_ASSIGN(ChildTraceMessageFilter);
 };
 
-} // namespace content
+} // namespace components
 
-#endif  // CONTENT_COMPONENTS_TRACING_CHILD_TRACE_MESSAGE_FILTER_H_
+#endif  // COMPONENTS_TRACING_CHILD_TRACE_MESSAGE_FILTER_H_
diff --git a/content/components/tracing/tracing_messages.cc b/components/tracing/tracing_messages.cc
index df41fad..3d7637a 100644
--- a/content/components/tracing/tracing_messages.cc
+++ b/components/tracing/tracing_messages.cc
@@ -4,31 +4,31 @@
 
 // Get basic type definitions.
 #define IPC_MESSAGE_IMPL
-#include "content/components/tracing/tracing_messages.h"
+#include "components/tracing/tracing_messages.h"
 
 // Generate constructors.
 #include "ipc/struct_constructor_macros.h"
-#include "content/components/tracing/tracing_messages.h"
+#include "components/tracing/tracing_messages.h"
 
 // Generate destructors.
 #include "ipc/struct_destructor_macros.h"
-#include "content/components/tracing/tracing_messages.h"
+#include "components/tracing/tracing_messages.h"
 
 // Generate param traits write methods.
 #include "ipc/param_traits_write_macros.h"
 namespace IPC {
-#include "content/components/tracing/tracing_messages.h"
+#include "components/tracing/tracing_messages.h"
 }  // namespace IPC
 
 // Generate param traits read methods.
 #include "ipc/param_traits_read_macros.h"
 namespace IPC {
-#include "content/components/tracing/tracing_messages.h"
+#include "components/tracing/tracing_messages.h"
 }  // namespace IPC
 
 // Generate param traits log methods.
 #include "ipc/param_traits_log_macros.h"
 namespace IPC {
-#include "content/components/tracing/tracing_messages.h"
+#include "components/tracing/tracing_messages.h"
 }  // namespace IPC
 
diff --git a/content/components/tracing/tracing_messages.h b/components/tracing/tracing_messages.h
index 792c476..792c476 100644
--- a/content/components/tracing/tracing_messages.h
+++ b/components/tracing/tracing_messages.h
diff --git a/content/browser/DEPS b/content/browser/DEPS
index 8a06869..720e4c9 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+content/components/tracing",
+  "+components/tracing",
   "+content/gpu",  # For gpu_info_collector.h and in-process GPU
   "+content/port/browser",
   "+content/public/browser",
diff --git a/content/browser/trace_message_filter.cc b/content/browser/trace_message_filter.cc
index a2586a1..d37ce12 100644
--- a/content/browser/trace_message_filter.cc
+++ b/content/browser/trace_message_filter.cc
@@ -4,8 +4,8 @@
 
 #include "content/browser/trace_message_filter.h"
 
+#include "components/tracing/tracing_messages.h"
 #include "content/browser/trace_controller_impl.h"
-#include "content/components/tracing/tracing_messages.h"
 
 namespace content {
 
diff --git a/content/common/DEPS b/content/common/DEPS
index 3a97cab..bd4bed3 100644
--- a/content/common/DEPS
+++ b/content/common/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+cc",
+  "+components/tracing",
   "+media/base",
   "+sandbox/linux/seccomp-legacy",
-  "+content/components/tracing",
 ]
diff --git a/content/common/child_thread.cc b/content/common/child_thread.cc
index 8b1b000..ea1a665 100644
--- a/content/common/child_thread.cc
+++ b/content/common/child_thread.cc
@@ -11,6 +11,7 @@
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/tracked_objects.h"
+#include "components/tracing/child_trace_message_filter.h"
 #include "content/common/child_histogram_message_filter.h"
 #include "content/common/child_process.h"
 #include "content/common/child_process_messages.h"
@@ -18,7 +19,6 @@
 #include "content/common/quota_dispatcher.h"
 #include "content/common/resource_dispatcher.h"
 #include "content/common/socket_stream_dispatcher.h"
-#include "content/components/tracing/child_trace_message_filter.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_switches.h"
@@ -115,7 +115,7 @@ void ChildThread::Init() {
 
   channel_->AddFilter(histogram_message_filter_.get());
   channel_->AddFilter(sync_message_filter_.get());
-  channel_->AddFilter(new ChildTraceMessageFilter(
+  channel_->AddFilter(new components::ChildTraceMessageFilter(
       ChildProcess::current()->io_message_loop_proxy()));
 
 #if defined(OS_POSIX)
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 5b59060..35aedb1 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -6,13 +6,13 @@
   'dependencies': [
     '../base/base.gyp:base',
     '../build/temp_gyp/googleurl.gyp:googleurl',
+    '../components/components_tracing.gyp:tracing',
     '../media/media.gyp:media',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
     '../third_party/icu/icu.gyp:icuuc',
     '../ui/ui.gyp:ui',
     '../webkit/support/webkit_support.gyp:user_agent',
-    'content_components_tracing.gyp:tracing',
   ],
   'include_dirs': [
     '..',
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index 19bc4f7..bb2451d 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -449,7 +449,7 @@
             '../../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted',
             '../../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted',
             '../../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted',
-            '../../content/content_components_tracing_untrusted.gyp:tracing_untrusted',
+            '../../components/components_tracing_untrusted.gyp:tracing_untrusted',
             '../../ipc/ipc_untrusted.gyp:ipc_untrusted',
             '../../base/base_untrusted.gyp:base_untrusted',
             '../../media/media_untrusted.gyp:shared_memory_support_untrusted',
diff --git a/ppapi/ppapi_ipc_proxy_untrusted.gyp b/ppapi/ppapi_ipc_proxy_untrusted.gyp
index ea9d8d2..a5d3f88 100644
--- a/ppapi/ppapi_ipc_proxy_untrusted.gyp
+++ b/ppapi/ppapi_ipc_proxy_untrusted.gyp
@@ -50,7 +50,7 @@
             '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
             '../ppapi/ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted',
             '../third_party/khronos/khronos.gyp:khronos_headers',
-            '../content/content_components_tracing_untrusted.gyp:tracing_untrusted',
+            '../components/components_tracing_untrusted.gyp:tracing_untrusted',
           ],
         },
       ],
diff --git a/ppapi/ppapi_ipc_untrusted.gyp b/ppapi/ppapi_ipc_untrusted.gyp
index 2e1382f..f1711fe 100644
--- a/ppapi/ppapi_ipc_untrusted.gyp
+++ b/ppapi/ppapi_ipc_untrusted.gyp
@@ -39,7 +39,7 @@
             '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted',
             '../ipc/ipc_untrusted.gyp:ipc_untrusted',
             '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
-            '../content/content_components_tracing_untrusted.gyp:tracing_untrusted',
+            '../components/components_tracing_untrusted.gyp:tracing_untrusted',
           ],
         },
       ],
diff --git a/ppapi/proxy/DEPS b/ppapi/proxy/DEPS
index ded8bf6..e56cd3d 100644
--- a/ppapi/proxy/DEPS
+++ b/ppapi/proxy/DEPS
@@ -1,11 +1,11 @@
 include_rules = [
   "+base",
-  "+ipc",
+  "+components/tracing",
   "+gpu",
+  "+ipc",
   "+media/audio",
   "+skia",
   "+ui/surface",
-  "+content/components/tracing",
 
   # We don't want the proxy to depend on the C++ layer, which is appropriate
   # for plugins only. However, the completion callback factory is a very useful
diff --git a/ppapi/proxy/plugin_main_nacl.cc b/ppapi/proxy/plugin_main_nacl.cc
index d3886f6..04d9be3 100644
--- a/ppapi/proxy/plugin_main_nacl.cc
+++ b/ppapi/proxy/plugin_main_nacl.cc
@@ -14,7 +14,7 @@
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
-#include "content/components/tracing/child_trace_message_filter.h"
+#include "components/tracing/child_trace_message_filter.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message.h"
@@ -106,7 +106,7 @@ PpapiDispatcher::PpapiDispatcher(scoped_refptr<base::MessageLoopProxy> io_loop)
       "NaCl IPC", base::FileDescriptor(NACL_IPC_FD, false));
   InitWithChannel(this, channel_handle, false);  // Channel is server.
   channel()->AddFilter(
-      new content::ChildTraceMessageFilter(message_loop_));
+      new components::ChildTraceMessageFilter(message_loop_));
 }
 
 base::MessageLoopProxy* PpapiDispatcher::GetIPCMessageLoop() {