From f074608f3fe830a7ba2edd347c6fc15203aa6b36 Mon Sep 17 00:00:00 2001 From: "jbates@chromium.org" Date: Thu, 6 Sep 2012 00:18:38 +0000 Subject: Fix flakiness of TracingBrowserTest.BeginTracingWithWatch test BUG=146255 Review URL: https://chromiumcodereview.appspot.com/10913097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155067 0039d316-1c4b-4281-b951-d872f2087c98 --- content/renderer/render_view_impl.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'content/renderer/render_view_impl.cc') diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 7bd2986..7fdc448 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -1216,8 +1216,6 @@ void RenderViewImpl::OnNavigate(const ViewMsg_Navigate_Params& params) { // In case LoadRequest failed before DidCreateDataSource was called. pending_navigation_params_.reset(); - - UNSHIPPED_TRACE_EVENT_INSTANT0("test_tracing", "RenderViewImpl::OnNavigate"); } bool RenderViewImpl::IsBackForwardToStaleEntry( @@ -4811,6 +4809,7 @@ void RenderViewImpl::OnScriptEvalRequest(const string16& frame_xpath, const string16& jscript, int id, bool notify_result) { + UNSHIPPED_TRACE_EVENT_INSTANT0("test_tracing", "OnScriptEvalRequest"); EvaluateScript(frame_xpath, jscript, id, notify_result); } -- cgit v1.1