Merge gpu_trace_event back into base/debug/trace_event

chrome/browser/external_tab_container_win.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/browser/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
@@ skipping 712 matching lines @@
     return;
 
   static const int kHttpClientErrorStart = 400;
   static const int kHttpServerErrorEnd = 510;
 
   switch (type.value) {
     case NotificationType::LOAD_STOP: {
         const LoadNotificationDetails* load =
             Details<LoadNotificationDetails>(details).ptr();
         if (load != NULL && PageTransition::IsMainFrame(load->origin())) {
-          TRACE_EVENT_END("ExternalTabContainer::Navigate", 0,
-                          load->url().spec());
+          TRACE_EVENT_END_ETW("ExternalTabContainer::Navigate", 0,
+                              load->url().spec());
           automation_->Send(new AutomationMsg_TabLoaded(tab_handle_,
                                                         load->url()));
         }
         break;
       }
     case NotificationType::NAV_ENTRY_COMMITTED: {
         if (ignore_next_load_notification_) {
           ignore_next_load_notification_ = false;
           return;
         }
@@ skipping 220 matching lines @@
   }
   return true;
 }
 
 void ExternalTabContainer::Navigate(const GURL& url, const GURL& referrer) {
   if (!tab_contents_.get()) {
     NOTREACHED();
     return;
   }
 
-  TRACE_EVENT_BEGIN("ExternalTabContainer::Navigate", 0, url.spec());
+  TRACE_EVENT_BEGIN_ETW("ExternalTabContainer::Navigate", 0, url.spec());
 
   tab_contents_->controller().LoadURL(url, referrer,
                                       PageTransition::START_PAGE);
 }
 
 bool ExternalTabContainer::OnGoToEntryOffset(int offset) {
   if (load_requests_via_automation_) {
     automation_->Send(new AutomationMsg_RequestGoToHistoryEntryOffset(
         tab_handle_, offset));
     return false;
@@ skipping 118 matching lines @@
 
   if (disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     disposition = NEW_FOREGROUND_TAB;
   }
   ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition,
                                        transition);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
 }