Merge gpu_trace_event back into base/debug/trace_event

chrome_frame/chrome_active_document.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.
 
 // Implementation of ChromeActiveDocument
 #include "chrome_frame/chrome_active_document.h"
 
 #include <hlink.h>
 #include <htiface.h>
 #include <initguid.h>
@@ skipping 48 matching lines @@
 #undef DEFINE_ENCODING_ID_ARRAY
   0  // The Last data must be 0 to indicate the end of the encoding id array.
 };
 
 ChromeActiveDocument::ChromeActiveDocument()
     : navigation_info_(new NavigationInfo()),
       first_navigation_(true),
       is_automation_client_reused_(false),
       popup_allowed_(false),
       accelerator_table_(NULL) {
-  TRACE_EVENT_BEGIN("chromeframe.createactivedocument", this, "");
+  TRACE_EVENT_BEGIN_ETW("chromeframe.createactivedocument", this, "");
 
   url_fetcher_->set_frame_busting(false);
   memset(navigation_info_.get(), 0, sizeof(NavigationInfo));
 }
 
 HRESULT ChromeActiveDocument::FinalConstruct() {
   // If we have a cached ChromeActiveDocument instance in TLS, then grab
   // ownership of the cached document's automation client. This is an
   // optimization to get Chrome active documents to load faster.
   ChromeActiveDocument* cached_document = g_active_doc_cache.Get();
@@ skipping 46 matching lines @@
   return S_OK;
 }
 
 ChromeActiveDocument::~ChromeActiveDocument() {
   DVLOG(1) << __FUNCTION__;
   if (find_dialog_.IsWindow())
     find_dialog_.DestroyWindow();
   // ChromeFramePlugin
   BaseActiveX::Uninitialize();
 
-  TRACE_EVENT_END("chromeframe.createactivedocument", this, "");
+  TRACE_EVENT_END_ETW("chromeframe.createactivedocument", this, "");
 }
 
 // Override DoVerb
 STDMETHODIMP ChromeActiveDocument::DoVerb(LONG verb,
                                           LPMSG msg,
                                           IOleClientSite* active_site,
                                           LONG index,
                                           HWND parent_window,
                                           LPCRECT pos) {
   // IE will try and in-place activate us in some cases. This happens when
@@ skipping 1254 matching lines @@
     return true;
 
   if (new_navigation_info.url != navigation_info_->url)
     return true;
 
   if (new_navigation_info.referrer != navigation_info_->referrer)
     return true;
 
   return false;
 }