Merge gpu_trace_event back into base/debug/trace_event

ppapi/proxy/host_dispatcher.cc

 // 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.
 
 #include "ppapi/proxy/host_dispatcher.h"
 
 #include <map>
 
+#include "base/debug/trace_event.h"
 #include "base/logging.h"
-#include "gpu/common/gpu_trace_event.h"
 #include "ppapi/c/private/ppb_proxy_private.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/proxy/host_var_serialization_rules.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
 namespace pp {
 namespace proxy {
 
 namespace {
 
@@ skipping 101 matching lines @@
       instance);
   if (found != g_instance_to_dispatcher->end())
     g_instance_to_dispatcher->erase(found);
 }
 
 bool HostDispatcher::IsPlugin() const {
   return false;
 }
 
 bool HostDispatcher::Send(IPC::Message* msg) {
-  GPU_TRACE_EVENT2("ppapi proxy", "HostDispatcher::Send",
-                   "Class", IPC_MESSAGE_ID_CLASS(msg->type()),
-                   "Line", IPC_MESSAGE_ID_LINE(msg->type()));
+  TRACE_EVENT2("ppapi proxy", "HostDispatcher::Send",
+               "Class", IPC_MESSAGE_ID_CLASS(msg->type()),
+               "Line", IPC_MESSAGE_ID_LINE(msg->type()));
   // Normal sync messages are set to unblock, which would normally cause the
   // plugin to be reentered to process them. We only want to do this when we
   // know the plugin is in a state to accept reentrancy. Since the plugin side
   // never clears this flag on messages it sends, we can't get deadlock, but we
   // may still get reentrancy in the host as a result.
   if (!allow_plugin_reentrancy_)
     msg->set_unblock(false);
   return Dispatcher::Send(msg);
 }
 
 bool HostDispatcher::OnMessageReceived(const IPC::Message& msg) {
-  GPU_TRACE_EVENT2("ppapi proxy", "HostDispatcher::OnMessageReceived",
-                   "Class", IPC_MESSAGE_ID_CLASS(msg.type()),
-                   "Line", IPC_MESSAGE_ID_LINE(msg.type()));
+  TRACE_EVENT2("ppapi proxy", "HostDispatcher::OnMessageReceived",
+               "Class", IPC_MESSAGE_ID_CLASS(msg.type()),
+               "Line", IPC_MESSAGE_ID_LINE(msg.type()));
   // We only want to allow reentrancy when the most recent message from the
   // plugin was a scripting message. We save the old state of the flag on the
   // stack in case we're (we are the host) being reentered ourselves. The flag
   // is set to false here for all messages, and then the scripting API will
   // explicitly set it to true during processing of those messages that can be
   // reentered.
   BoolRestorer restorer(&allow_plugin_reentrancy_);
   allow_plugin_reentrancy_ = false;
 
   // Handle common control messages.
@@ skipping 97 matching lines @@
   dispatcher_->ppb_proxy()->AddRefModule(dispatcher_->pp_module());
 }
 
 ScopedModuleReference::~ScopedModuleReference() {
   dispatcher_->ppb_proxy()->ReleaseModule(dispatcher_->pp_module());
 }
 
 }  // namespace proxy
 }  // namespace pp