Fix latency tests

ui/surface/accelerated_surface_win.cc

 // Copyright (c) 2012 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 "ui/surface/accelerated_surface_win.h"
 
 #include <windows.h>
 #include <algorithm>
 
 #include "base/bind.h"
@@ skipping 483 matching lines @@
     present_size_.width(), present_size_.height()
   };
 
   {
     TRACE_EVENT0("gpu", "PresentEx");
     hr = swap_chain_->Present(&present_rect,
                               &present_rect,
                               window_,
                               NULL,
                               D3DPRESENT_INTERVAL_IMMEDIATE);
+    // For latency_tests.cc:
+    UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete");
     if (FAILED(hr))
       return false;
   }
 
   return true;
 }
 
 bool AcceleratedPresenter::CopyTo(const gfx::Size& size, void* buf) {
   base::AutoLock locked(lock_);
 
@@ skipping 309 matching lines @@
     } while (hr == S_FALSE);
   }
 
   static const base::TimeDelta swap_delay = GetSwapDelay();
   if (swap_delay.ToInternalValue())
     base::PlatformThread::Sleep(swap_delay);
 
   {
     TRACE_EVENT0("gpu", "Present");
     hr = swap_chain_->Present(&rect, &rect, window_, NULL, 0);
+    // For latency_tests.cc:
+    UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete");
     if (FAILED(hr) &&
         FAILED(present_thread_->device()->CheckDeviceState(window_))) {
       present_thread_->ResetDevice();
     }
   }
 
   hidden_ = false;
 }
 
 void AcceleratedPresenter::DoSuspend() {
@@ skipping 24 matching lines @@
   return presenter_->CopyTo(size, buf);
 }
 
 void AcceleratedSurface::Suspend() {
   presenter_->Suspend();
 }
 
 void AcceleratedSurface::WasHidden() {
   presenter_->WasHidden();
 }