Merge gpu_trace_event back into base/debug/trace_event

chrome/browser/automation/automation_provider_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/automation/automation_provider.h"
 
 #include "base/debug/trace_event.h"
 #include "base/json/json_reader.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_browser_tracker.h"
@@ skipping 215 matching lines @@
   } else {
     AutomationMsg_WindowDrag::WriteReplyParams(reply_message, false);
     Send(reply_message);
   }
 }
 
 void AutomationProvider::CreateExternalTab(
     const ExternalTabSettings& settings,
     gfx::NativeWindow* tab_container_window, gfx::NativeWindow* tab_window,
     int* tab_handle, int* session_id) {
-  TRACE_EVENT_BEGIN("AutomationProvider::CreateExternalTab", 0, "");
+  TRACE_EVENT_BEGIN_ETW("AutomationProvider::CreateExternalTab", 0, "");
 
   *tab_handle = 0;
   *tab_container_window = NULL;
   *tab_window = NULL;
   *session_id = -1;
   scoped_refptr<ExternalTabContainer> external_tab_container =
       new ExternalTabContainer(this, automation_resource_message_filter_);
 
   Profile* profile = settings.is_incognito ?
       profile_->GetOffTheRecordProfile() : profile_;
 
   // When the ExternalTabContainer window is created we grab a reference on it
   // which is released when the window is destroyed.
   external_tab_container->Init(profile, settings.parent, settings.dimensions,
       settings.style, settings.load_requests_via_automation,
       settings.handle_top_level_requests, NULL, settings.initial_url,
       settings.referrer, settings.infobars_enabled,
       settings.route_all_top_level_navigations);
 
   if (AddExternalTab(external_tab_container)) {
     TabContents* tab_contents = external_tab_container->tab_contents();
     *tab_handle = external_tab_container->tab_handle();
     *tab_container_window = external_tab_container->GetNativeView();
     *tab_window = tab_contents->GetNativeView();
     *session_id = tab_contents->controller().session_id().id();
   } else {
     external_tab_container->Uninitialize();
   }
 
-  TRACE_EVENT_END("AutomationProvider::CreateExternalTab", 0, "");
+  TRACE_EVENT_END_ETW("AutomationProvider::CreateExternalTab", 0, "");
 }
 
 bool AutomationProvider::AddExternalTab(ExternalTabContainer* external_tab) {
   DCHECK(external_tab != NULL);
 
   TabContents* tab_contents = external_tab->tab_contents();
   if (tab_contents) {
     int tab_handle = tab_tracker_->Add(&tab_contents->controller());
     external_tab->SetTabHandle(tab_handle);
     return true;
@@ skipping 90 matching lines @@
 }
 
 void AutomationProvider::ConnectExternalTab(
     uint64 cookie,
     bool allow,
     gfx::NativeWindow parent_window,
     gfx::NativeWindow* tab_container_window,
     gfx::NativeWindow* tab_window,
     int* tab_handle,
     int* session_id) {
-  TRACE_EVENT_BEGIN("AutomationProvider::ConnectExternalTab", 0, "");
+  TRACE_EVENT_BEGIN_ETW("AutomationProvider::ConnectExternalTab", 0, "");
 
   *tab_handle = 0;
   *tab_container_window = NULL;
   *tab_window = NULL;
   *session_id = -1;
 
   scoped_refptr<ExternalTabContainer> external_tab_container =
       ExternalTabContainer::RemovePendingTab(static_cast<uintptr_t>(cookie));
   if (!external_tab_container.get()) {
     NOTREACHED();
     return;
   }
 
   if (allow && AddExternalTab(external_tab_container)) {
     external_tab_container->Reinitialize(this,
                                          automation_resource_message_filter_,
                                          parent_window);
     TabContents* tab_contents = external_tab_container->tab_contents();
     *tab_handle = external_tab_container->tab_handle();
     *tab_container_window = external_tab_container->GetNativeView();
     *tab_window = tab_contents->GetNativeView();
     *session_id = tab_contents->controller().session_id().id();
   } else {
     external_tab_container->Uninitialize();
   }
 
-  TRACE_EVENT_END("AutomationProvider::ConnectExternalTab", 0, "");
+  TRACE_EVENT_END_ETW("AutomationProvider::ConnectExternalTab", 0, "");
 }
 
 void AutomationProvider::OnBrowserMoved(int tab_handle) {
   ExternalTabContainer* external_tab = GetExternalTabForHandle(tab_handle);
   if (external_tab) {
     external_tab->WindowMoved();
   } else {
     DLOG(WARNING) <<
       "AutomationProvider::OnBrowserMoved called with invalid tab handle.";
   }
@@ skipping 45 matching lines @@
 
 void AutomationProvider::OnSetZoomLevel(int handle, int zoom_level) {
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
     if (tab->tab_contents() && tab->tab_contents()->render_view_host()) {
       tab->tab_contents()->render_view_host()->Zoom(
           static_cast<PageZoom::Function>(zoom_level));
     }
   }
 }