[WIP] cc: Plumb SurfaceId from clients

content/public/test/browser_test_utils.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 "content/public/test/browser_test_utils.h"
 
 #include <stddef.h>
 #include <tuple>
 #include <utility>
 
@@ skipping 1302 matching lines @@
   last_metadata_ = std::move(metadata);
   if (frames_to_wait_ == 0)
     quit_.Run();
 }
 
 bool FrameWatcher::OnMessageReceived(const IPC::Message& message) {
   if (message.type() == ViewHostMsg_SwapCompositorFrame::ID) {
     ViewHostMsg_SwapCompositorFrame::Param param;
     if (!ViewHostMsg_SwapCompositorFrame::Read(&message, &param))
       return false;
-    cc::CompositorFrame frame(std::move(std::get<1>(param)));
+    cc::CompositorFrame frame(std::move(std::get<2>(param)));
 
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&FrameWatcher::ReceivedFrameSwap, this,
                    base::Passed(std::move(frame.metadata))));
   }
   return false;
 }
 
 void FrameWatcher::AttachTo(WebContents* web_contents) {
@@ skipping 91 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (ack_result_ != INPUT_EVENT_ACK_STATE_UNKNOWN)
     return ack_result_;
   base::RunLoop run_loop;
   base::AutoReset<base::Closure> reset_quit(&quit_, run_loop.QuitClosure());
   run_loop.Run();
   return ack_result_;
 }
 
 }  // namespace content