7 files changed, 21 insertions, 20 deletions
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index 55f3d8c..8eaf0bf 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -130,9 +130,9 @@ HMODULE LoadChromeWithDirectory(std::wstring* dir) {
       key.Close();
     }
     if (pre_read) {
-      TRACE_EVENT_BEGIN_ETW("PreReadImage", 0, "");
+      TRACE_EVENT_BEGIN("PreReadImage", 0, "");
       file_util::PreReadImage(dir->c_str(), pre_read_size, pre_read_step_size);
-      TRACE_EVENT_END_ETW("PreReadImage", 0, "");
+      TRACE_EVENT_END("PreReadImage", 0, "");
     }
   }
 #endif  // NDEBUG
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 7f57e31..64eef79 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -111,7 +111,7 @@ AutomationProvider::AutomationProvider(Profile* profile)
       is_connected_(false),
       initial_tab_loads_complete_(false),
       network_library_initialized_(true) {
-  TRACE_EVENT_BEGIN_ETW("AutomationProvider::AutomationProvider", 0, "");
+  TRACE_EVENT_BEGIN("AutomationProvider::AutomationProvider", 0, "");
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -126,7 +126,7 @@ AutomationProvider::AutomationProvider(Profile* profile)
       new ExtensionTestResultNotificationObserver(this));
   g_browser_process->AddRefModule();
 
-  TRACE_EVENT_END_ETW("AutomationProvider::AutomationProvider", 0, "");
+  TRACE_EVENT_END("AutomationProvider::AutomationProvider", 0, "");
 }
 
 AutomationProvider::~AutomationProvider() {
@@ -137,7 +137,7 @@ AutomationProvider::~AutomationProvider() {
 }
 
 bool AutomationProvider::InitializeChannel(const std::string& channel_id) {
-  TRACE_EVENT_BEGIN_ETW("AutomationProvider::InitializeChannel", 0, "");
+  TRACE_EVENT_BEGIN("AutomationProvider::InitializeChannel", 0, "");
 
   channel_id_ = channel_id;
   std::string effective_channel_id = channel_id;
@@ -176,7 +176,7 @@ bool AutomationProvider::InitializeChannel(const std::string& channel_id) {
     delete observer;
 #endif
 
-  TRACE_EVENT_END_ETW("AutomationProvider::InitializeChannel", 0, "");
+  TRACE_EVENT_END("AutomationProvider::InitializeChannel", 0, "");
 
   return true;
 }
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc
index 0a11a49..c764004 100644
--- a/chrome/browser/automation/automation_provider_win.cc
+++ b/chrome/browser/automation/automation_provider_win.cc
@@ -233,7 +233,7 @@ void AutomationProvider::CreateExternalTab(
     const ExternalTabSettings& settings,
     gfx::NativeWindow* tab_container_window, gfx::NativeWindow* tab_window,
     int* tab_handle, int* session_id) {
-  TRACE_EVENT_BEGIN_ETW("AutomationProvider::CreateExternalTab", 0, "");
+  TRACE_EVENT_BEGIN("AutomationProvider::CreateExternalTab", 0, "");
 
   *tab_handle = 0;
   *tab_container_window = NULL;
@@ -263,7 +263,7 @@ void AutomationProvider::CreateExternalTab(
     external_tab_container->Uninitialize();
   }
 
-  TRACE_EVENT_END_ETW("AutomationProvider::CreateExternalTab", 0, "");
+  TRACE_EVENT_END("AutomationProvider::CreateExternalTab", 0, "");
 }
 
 bool AutomationProvider::AddExternalTab(ExternalTabContainer* external_tab) {
@@ -374,7 +374,7 @@ void AutomationProvider::ConnectExternalTab(
     gfx::NativeWindow* tab_window,
     int* tab_handle,
     int* session_id) {
-  TRACE_EVENT_BEGIN_ETW("AutomationProvider::ConnectExternalTab", 0, "");
+  TRACE_EVENT_BEGIN("AutomationProvider::ConnectExternalTab", 0, "");
 
   *tab_handle = 0;
   *tab_container_window = NULL;
@@ -401,7 +401,7 @@ void AutomationProvider::ConnectExternalTab(
     external_tab_container->Uninitialize();
   }
 
-  TRACE_EVENT_END_ETW("AutomationProvider::ConnectExternalTab", 0, "");
+  TRACE_EVENT_END("AutomationProvider::ConnectExternalTab", 0, "");
 }
 
 void AutomationProvider::OnBrowserMoved(int tab_handle) {
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index df7664f..6224df9 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -631,7 +631,7 @@ void HandleTestParameters(const CommandLine& command_line) {
 }
 
 void RunUIMessageLoop(BrowserProcess* browser_process) {
-  TRACE_EVENT_BEGIN_ETW("BrowserMain:MESSAGE_LOOP", 0, "");
+  TRACE_EVENT_BEGIN("BrowserMain:MESSAGE_LOOP", 0, "");
   // This should be invoked as close to the start of the browser's
   // UI thread message loop as possible to get a stable measurement
   // across versions.
@@ -654,7 +654,7 @@ void RunUIMessageLoop(BrowserProcess* browser_process) {
                                                         true);
 #endif
 
-  TRACE_EVENT_END_ETW("BrowserMain:MESSAGE_LOOP", 0, "");
+  TRACE_EVENT_END("BrowserMain:MESSAGE_LOOP", 0, "");
 }
 
 void AddFirstRunNewTabs(BrowserInit* browser_init,
@@ -1145,7 +1145,7 @@ bool IsMetricsReportingEnabled(const PrefService* local_state) {
 
 // Main routine for running as the Browser process.
 int BrowserMain(const MainFunctionParams& parameters) {
-  TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, "");
+  TRACE_EVENT_BEGIN("BrowserMain", 0, "");
 
   // If we're running tests (ui_task is non-null).
   if (parameters.ui_task)
@@ -1928,6 +1928,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
 #endif
-  TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
+  TRACE_EVENT_END("BrowserMain", 0, 0);
   return result_code;
 }
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
index 9e5e83d..b8625fe 100644
--- a/chrome/browser/external_tab_container_win.cc
+++ b/chrome/browser/external_tab_container_win.cc
@@ -730,8 +730,8 @@ void ExternalTabContainer::Observe(NotificationType type,
         const LoadNotificationDetails* load =
             Details<LoadNotificationDetails>(details).ptr();
         if (load != NULL && PageTransition::IsMainFrame(load->origin())) {
-          TRACE_EVENT_END_ETW("ExternalTabContainer::Navigate", 0,
-                              load->url().spec());
+          TRACE_EVENT_END("ExternalTabContainer::Navigate", 0,
+                          load->url().spec());
           automation_->Send(new AutomationMsg_TabLoaded(tab_handle_,
                                                         load->url()));
         }
@@ -980,7 +980,7 @@ void ExternalTabContainer::Navigate(const GURL& url, const GURL& referrer) {
     return;
   }
 
-  TRACE_EVENT_BEGIN_ETW("ExternalTabContainer::Navigate", 0, url.spec());
+  TRACE_EVENT_BEGIN("ExternalTabContainer::Navigate", 0, url.spec());
 
   tab_contents_->controller().LoadURL(url, referrer,
                                       PageTransition::START_PAGE);
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 25407e5..9ace239 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -31,6 +31,7 @@
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../content/content.gyp:content_browser',
         '../crypto/crypto.gyp:crypto',
+        '../gpu/gpu.gyp:gpu_common',
         '../media/media.gyp:media',
         '../ppapi/ppapi.gyp:ppapi_proxy',  # For PpapiMsg_LoadPlugin
         '../printing/printing.gyp:printing',
diff --git a/chrome/common/sandbox_policy.cc b/chrome/common/sandbox_policy.cc
index 7399a51..2e11e0b 100644
--- a/chrome/common/sandbox_policy.cc
+++ b/chrome/common/sandbox_policy.cc
@@ -601,7 +601,7 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
     return 0;
   }
 
-  TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess", 0, type_str);
+  TRACE_EVENT_BEGIN("StartProcessWithAccess", 0, type_str);
 
   // To decide if the process is going to be sandboxed we have two cases.
   // First case: all process types except the nacl broker, and the plugin
@@ -708,7 +708,7 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
     return 0;
   }
 
-  TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
+  TRACE_EVENT_BEGIN("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
 
   result = g_broker_services->SpawnTarget(
       cmd_line->GetProgram().value().c_str(),
@@ -716,7 +716,7 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
       policy, &target);
   policy->Release();
 
-  TRACE_EVENT_END_ETW("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
+  TRACE_EVENT_END("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
 
   if (sandbox::SBOX_ALL_OK != result)
     return 0;