Merge gpu_trace_event back into base/debug/trace_event

webkit/tools/test_shell/test_shell_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 "webkit/tools/test_shell/test_shell.h"
 
 #include <windows.h>
 #include <commdlg.h>
 #include <objbase.h>
 #include <process.h>
@@ skipping 461 matching lines @@
 
   MoveWindow(webViewWnd(), 0, URLBAR_HEIGHT, rc.right,
              rc.bottom - URLBAR_HEIGHT, TRUE);
 }
 
 void TestShell::LoadURLForFrame(const GURL& url,
                                 const std::wstring& frame_name) {
   if (!url.is_valid())
     return;
 
-  TRACE_EVENT_BEGIN("url.load", this, url.spec());
+  TRACE_EVENT_BEGIN_ETW("url.load", this, url.spec());
 
   if (IsSVGTestURL(url)) {
     SizeToSVG();
   } else {
     // only resize back to the default when running tests
     if (layout_test_mode())
       SizeToDefault();
   }
 
   navigation_controller_->LoadEntry(
@@ skipping 245 matching lines @@
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue