Merge gpu_trace_event back into base/debug/trace_event.

Initial land attempt at http://codereview.chromium.org/6551019/
gpu_trace_event fork at http://codereview.chromium.org/6691013

- gpu_trace_event renamed to base/debug/trace_event and modified as appropriate for base::debug
- Unit Tests implemented for trace_event
- gpu_common library removed (was added only for gpu_trace_event)
- Existing calls to trace_event suffixed with _ETW to make ETW calls (see decisions and incremental plans at end of 6551019)
- GPU trace calls renamed to new calls.
- Tracing switch removed from test_shell, as linux log file support removed.

BUG=79509
TEST=trace_event_win_unittest and about:gpu

Review URL: http://codereview.chromium.org/6862002

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

5 files changed, 14 insertions, 14 deletions

diff --git a/content/renderer/command_buffer_proxy.cc b/content/renderer/command_buffer_proxy.cc
index 6a1c06c..e50f0e4 100644
--- a/content/renderer/command_buffer_proxy.cc
+++ b/content/renderer/command_buffer_proxy.cc
@@ -4,6 +4,7 @@
 
 #include "content/renderer/command_buffer_proxy.h"
 
+#include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/shared_memory.h"
@@ -14,7 +15,6 @@
 #include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/render_thread.h"
 #include "gpu/command_buffer/common/cmd_buffer_common.h"
-#include "gpu/common/gpu_trace_event.h"
 #include "ui/gfx/size.h"
 
 using gpu::Buffer;
@@ -158,7 +158,7 @@ void CommandBufferProxy::Flush(int32 put_offset) {
 
 gpu::CommandBuffer::State CommandBufferProxy::FlushSync(int32 put_offset,
                                                         int32 last_known_get) {
-  GPU_TRACE_EVENT0("gpu", "CommandBufferProxy::FlushSync");
+  TRACE_EVENT0("gpu", "CommandBufferProxy::FlushSync");
   if (last_known_get == last_state_.get_offset) {
     // Send will flag state with lost context if IPC fails.
     if (last_state_.error == gpu::error::kNoError) {
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index 9471a99..c9a7052 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -137,7 +137,7 @@ RenderThread::RenderThread(const std::string& channel_name)
 }
 
 void RenderThread::Init() {
-  TRACE_EVENT_BEGIN("RenderThread::Init", 0, "");
+  TRACE_EVENT_BEGIN_ETW("RenderThread::Init", 0, "");
 
 #if defined(OS_MACOSX)
   // On Mac, the select popups are rendered by the browser.
@@ -169,7 +169,7 @@ void RenderThread::Init() {
 
   content::GetContentClient()->renderer()->RenderThreadStarted();
 
-  TRACE_EVENT_END("RenderThread::Init", 0, "");
+  TRACE_EVENT_END_ETW("RenderThread::Init", 0, "");
 }
 
 RenderThread::~RenderThread() {
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 6b190b3..2597ad6 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -5,6 +5,7 @@
 #include "content/renderer/render_widget.h"
 
 #include "base/command_line.h"
+#include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ -15,7 +16,6 @@
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/renderer_webkitclient_impl.h"
-#include "gpu/common/gpu_trace_event.h"
 #include "ipc/ipc_sync_message.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkShader.h"
@@ -305,7 +305,7 @@ void RenderWidget::OnRequestMoveAck() {
 }
 
 void RenderWidget::OnUpdateRectAck() {
-  GPU_TRACE_EVENT0("renderer", "RenderWidget::OnUpdateRectAck");
+  TRACE_EVENT0("renderer", "RenderWidget::OnUpdateRectAck");
   DCHECK(update_reply_pending());
   update_reply_pending_ = false;
 
@@ -553,7 +553,7 @@ void RenderWidget::CallDoDeferredUpdate() {
 }
 
 void RenderWidget::DoDeferredUpdate() {
-  GPU_TRACE_EVENT0("renderer", "RenderWidget::DoDeferredUpdate");
+  TRACE_EVENT0("renderer", "RenderWidget::DoDeferredUpdate");
 
   if (!webwidget_ || update_reply_pending())
     return;
diff --git a/content/renderer/renderer_gl_context.cc b/content/renderer/renderer_gl_context.cc
index 8d559c4..b0a28be 100644
--- a/content/renderer/renderer_gl_context.cc
+++ b/content/renderer/renderer_gl_context.cc
@@ -4,6 +4,7 @@
 
 #include "content/renderer/renderer_gl_context.h"
 
+#include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -27,7 +28,6 @@
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/common/constants.h"
-#include "gpu/common/gpu_trace_event.h"
 #include "gpu/GLES2/gles2_command_buffer.h"
 #endif  // ENABLE_GPU
 
@@ -293,7 +293,7 @@ bool RendererGLContext::MakeCurrent(RendererGLContext* context) {
 }
 
 bool RendererGLContext::SwapBuffers() {
-  GPU_TRACE_EVENT0("gpu", "RendererGLContext::SwapBuffers");
+  TRACE_EVENT0("gpu", "RendererGLContext::SwapBuffers");
   // Don't request latest error status from service. Just use the locally cached
   // information from the last flush.
   if (command_buffer_->GetLastState().error != gpu::error::kNoError)
@@ -376,7 +376,7 @@ bool RendererGLContext::Initialize(bool onscreen,
                                    const int32* attrib_list,
                                    const GURL& active_url) {
   DCHECK(size.width() >= 0 && size.height() >= 0);
-  GPU_TRACE_EVENT2("gpu", "RendererGLContext::Initialize",
+  TRACE_EVENT2("gpu", "RendererGLContext::Initialize",
                    "on_screen", onscreen, "num_pixels", size.GetArea());
 
   if (channel_->state() != GpuChannelHost::kConnected)
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 440ef77..36c73ba 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -129,7 +129,7 @@ class RendererMessageLoopObserver : public MessageLoop::TaskObserver {
 
 // mainline routine for running as the Renderer process
 int RendererMain(const MainFunctionParams& parameters) {
-  TRACE_EVENT_BEGIN("RendererMain", 0, "");
+  TRACE_EVENT_BEGIN_ETW("RendererMain", 0, "");
 
   const CommandLine& parsed_command_line = parameters.command_line_;
   base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_;
@@ -231,12 +231,12 @@ int RendererMain(const MainFunctionParams& parameters) {
     if (run_loop) {
       if (pool)
         pool->Recycle();
-      TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0);
+      TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
       MessageLoop::current()->Run();
-      TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0);
+      TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
     }
   }
   platform.PlatformUninitialize();
-  TRACE_EVENT_END("RendererMain", 0, "");
+  TRACE_EVENT_END_ETW("RendererMain", 0, "");
   return 0;
 }