Add a |scope| argument to TRACE_EVENT_INSTANT* and require its presence.

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 757 matching lines @@
   present_size_ = size;
 
   // If it is expected that Direct3D cannot be used reliably because the window
   // is resizing, fall back to presenting with GDI.
   if (CheckDirect3DWillWork()) {
     TRACE_EVENT0("gpu", "PresentD3D");
 
     hr = swap_chain_->Present(&rect, &rect, window_, NULL, 0);
 
     // For latency_tests.cc:
-    UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete");
+    UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete",
+                                   TRACE_EVENT_SCOPE_THREAD);
 
     if (FAILED(hr)) {
       if (present_thread_->IsDeviceLost())
         present_thread_->ResetDevice();
       return;
     }
   } else {
     HDC dc = GetDC(window_);
     PresentWithGDI(dc);
     ReleaseDC(window_, dc);
@@ skipping 158 matching lines @@
                   present_size_.height(),
                   locked_surface.pBits,
                   &bitmap_info,
                   DIB_RGB_COLORS,
                   SRCCOPY);
   }
 
   system_surface->UnlockRect();
 
   // For latency_tests.cc:
-  UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete");
+  UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete",
+                                 TRACE_EVENT_SCOPE_THREAD);
 }
 
 gfx::Size AcceleratedPresenter::GetWindowSize() {
   RECT rect;
   GetClientRect(window_, &rect);
   return gfx::Rect(rect).size();
 }
 
 bool AcceleratedPresenter::CheckDirect3DWillWork() {
   // On a composited desktop, when the screen saver or logon screen are
@@ skipping 59 matching lines @@
   presenter_->Suspend();
 }
 
 void AcceleratedSurface::WasHidden() {
   presenter_->WasHidden();
 }
 
 void AcceleratedSurface::SetIsSessionLocked(bool locked) {
   presenter_->SetIsSessionLocked(locked);
 }