Merge gpu_trace_event back into base/debug/trace_event

chrome/browser/automation/automation_provider.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 <set>
 
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
@@ skipping 93 matching lines @@
 
 using base::Time;
 
 AutomationProvider::AutomationProvider(Profile* profile)
     : profile_(profile),
       reply_message_(NULL),
       reinitialize_on_channel_error_(false),
       is_connected_(false),
       initial_tab_loads_complete_(false),
       network_library_initialized_(true) {
-  TRACE_EVENT_BEGIN("AutomationProvider::AutomationProvider", 0, "");
+  TRACE_EVENT_BEGIN_ETW("AutomationProvider::AutomationProvider", 0, "");
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   browser_tracker_.reset(new AutomationBrowserTracker(this));
   extension_tracker_.reset(new AutomationExtensionTracker(this));
   tab_tracker_.reset(new AutomationTabTracker(this));
   window_tracker_.reset(new AutomationWindowTracker(this));
   autocomplete_edit_tracker_.reset(
       new AutomationAutocompleteEditTracker(this));
   new_tab_ui_load_observer_.reset(new NewTabUILoadObserver(this));
   metric_event_duration_observer_.reset(new MetricEventDurationObserver());
   extension_test_result_observer_.reset(
       new ExtensionTestResultNotificationObserver(this));
   g_browser_process->AddRefModule();
 
-  TRACE_EVENT_END("AutomationProvider::AutomationProvider", 0, "");
+  TRACE_EVENT_END_ETW("AutomationProvider::AutomationProvider", 0, "");
 }
 
 AutomationProvider::~AutomationProvider() {
   if (channel_.get())
     channel_->Close();
 
   g_browser_process->ReleaseModule();
 }
 
 bool AutomationProvider::InitializeChannel(const std::string& channel_id) {
-  TRACE_EVENT_BEGIN("AutomationProvider::InitializeChannel", 0, "");
+  TRACE_EVENT_BEGIN_ETW("AutomationProvider::InitializeChannel", 0, "");
 
   channel_id_ = channel_id;
   std::string effective_channel_id = channel_id;
 
   // If the channel_id starts with kNamedInterfacePrefix, create a named IPC
   // server and listen on it, else connect as client to an existing IPC server
   bool use_named_interface =
       channel_id.find(automation::kNamedInterfacePrefix) == 0;
   if (use_named_interface) {
     effective_channel_id = channel_id.substr(
@@ skipping 19 matching lines @@
 
 #if defined(OS_CHROMEOS)
   // Wait for the network manager to initialize.
   // The observer will delete itself when done.
   network_library_initialized_ = false;
   NetworkManagerInitObserver* observer = new NetworkManagerInitObserver(this);
   if (!observer->Init())
     delete observer;
 #endif
 
-  TRACE_EVENT_END("AutomationProvider::InitializeChannel", 0, "");
+  TRACE_EVENT_END_ETW("AutomationProvider::InitializeChannel", 0, "");
 
   return true;
 }
 
 std::string AutomationProvider::GetProtocolVersion() {
   chrome::VersionInfo version_info;
   return version_info.Version().c_str();
 }
 
 void AutomationProvider::SetExpectedTabCount(size_t expected_tabs) {
@@ skipping 771 matching lines @@
 
 void AutomationProvider::SaveAsAsync(int tab_handle) {
   NavigationController* tab = NULL;
   TabContents* tab_contents = GetTabContentsForHandle(tab_handle, &tab);
   if (tab_contents) {
     TabContentsWrapper* wrapper =
         TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
     wrapper->download_tab_helper()->OnSavePage();
   }
 }