Merge gpu_trace_event back into base/debug/trace_event

webkit/tools/test_shell/test_webview_delegate.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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 801 matching lines @@
 
 void TestWebViewDelegate::didHandleOnloadEvents(WebFrame* frame) {
 }
 
 void TestWebViewDelegate::didFailLoad(
     WebFrame* frame, const WebURLError& error) {
   LocationChangeDone(frame);
 }
 
 void TestWebViewDelegate::didFinishLoad(WebFrame* frame) {
-  TRACE_EVENT_END("frame.load", this, frame->url().spec());
+  TRACE_EVENT_END_ETW("frame.load", this, frame->url().spec());
   UpdateAddressBar(frame->view());
   LocationChangeDone(frame);
 }
 
 void TestWebViewDelegate::didNavigateWithinPage(
     WebFrame* frame, bool is_new_navigation) {
   frame->dataSource()->setExtraData(pending_extra_data_.release());
 
   UpdateForCommittedLoad(frame, is_new_navigation);
 }
@@ skipping 37 matching lines @@
 
     // To block the request, we set its URL to an empty one.
     request.setURL(WebURL());
     return;
   }
 
   for (std::set<std::string>::const_iterator header = clear_headers_.begin();
        header != clear_headers_.end(); ++header)
     request.clearHTTPHeaderField(WebString::fromUTF8(*header));
 
-  TRACE_EVENT_BEGIN("url.load", identifier, request_url);
+  TRACE_EVENT_BEGIN_ETW("url.load", identifier, request_url);
   // Set the new substituted URL.
   request.setURL(GURL(TestShell::RewriteLocalUrl(request_url)));
 }
 
 void TestWebViewDelegate::didReceiveResponse(
     WebFrame* frame, unsigned identifier, const WebURLResponse& response) {
 }
 
 void TestWebViewDelegate::didFinishResourceLoad(
     WebFrame* frame, unsigned identifier) {
-  TRACE_EVENT_END("url.load", identifier, "");
+  TRACE_EVENT_END_ETW("url.load", identifier, "");
   resource_identifier_map_.erase(identifier);
 }
 
 void TestWebViewDelegate::didFailResourceLoad(
     WebFrame* frame, unsigned identifier, const WebURLError& error) {
   resource_identifier_map_.erase(identifier);
 }
 
 void TestWebViewDelegate::didDisplayInsecureContent(WebFrame* frame) {
 }
@@ skipping 218 matching lines @@
 }
 
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }