Merge gpu_trace_event back into base/debug/trace_event

chrome_frame/chrome_frame_activex.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 "chrome_frame/chrome_frame_activex.h"
 
 #include <wininet.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 130 matching lines @@
                             GURL* url) {
   *referrer = params.frame_url.is_empty() ? params.page_url : params.frame_url;
   *url = (cmd == IDS_CONTENT_CONTEXT_SAVELINKAS ?
       params.link_url : params.src_url);
 }
 
 }  // namespace chrome_frame
 
 ChromeFrameActivex::ChromeFrameActivex()
     : chrome_wndproc_hook_(NULL) {
-  TRACE_EVENT_BEGIN("chromeframe.createactivex", this, "");
+  TRACE_EVENT_BEGIN_ETW("chromeframe.createactivex", this, "");
 }
 
 HRESULT ChromeFrameActivex::FinalConstruct() {
   HRESULT hr = Base::FinalConstruct();
   if (FAILED(hr))
     return hr;
 
   // No need to call FireOnChanged at this point since nobody will be listening.
   ready_state_ = READYSTATE_LOADING;
   return S_OK;
 }
 
 ChromeFrameActivex::~ChromeFrameActivex() {
   // We expect these to be released during a call to SetClientSite(NULL).
   DCHECK_EQ(0u, onmessage_.size());
   DCHECK_EQ(0u, onloaderror_.size());
   DCHECK_EQ(0u, onload_.size());
   DCHECK_EQ(0u, onreadystatechanged_.size());
   DCHECK_EQ(0u, onextensionready_.size());
 
   if (chrome_wndproc_hook_) {
     BOOL unhook_success = ::UnhookWindowsHookEx(chrome_wndproc_hook_);
     DCHECK(unhook_success);
   }
 
   // ChromeFramePlugin::Uninitialize()
   Base::Uninitialize();
 
-  TRACE_EVENT_END("chromeframe.createactivex", this, "");
+  TRACE_EVENT_END_ETW("chromeframe.createactivex", this, "");
 }
 
 LRESULT ChromeFrameActivex::OnCreate(UINT message, WPARAM wparam, LPARAM lparam,
                                      BOOL& handled) {
   Base::OnCreate(message, wparam, lparam, handled);
   // Install the notification hook on the top-level window, so that we can
   // be notified on move events.  Note that the return value is not checked.
   // This hook is installed here, as opposed to during IOleObject_SetClientSite
   // because m_hWnd has not yet been assigned during the SetSite call.
   InstallTopLevelHook(m_spClientSite);
@@ skipping 492 matching lines @@
   if (FAILED(hr)) {
     NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:"
                  << base::StringPrintf(" 0x%08X", hr);
     return hr;
   }
 
   web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string),
                             base::win::ScopedVariant(bho));
   return S_OK;
 }