Apply merge from @fsamuel.

content/browser/browser_plugin/test_browser_plugin_guest.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/browser/browser_plugin/test_browser_plugin_guest.h"
 
 #include "base/test/test_timeouts.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/browser_plugin_messages.h"
@@ skipping 249 matching lines @@
 }
 
 void TestBrowserPluginGuest::Stop() {
   stop_observed_ = true;
   if (stop_message_loop_runner_)
     stop_message_loop_runner_->Quit();
   BrowserPluginGuest::Stop();
 }
 
 void TestBrowserPluginGuest::SetDamageBuffer(
-    TransportDIB* damage_buffer,
-#if defined(OS_WIN)
-    int damage_buffer_size,
-    TransportDIB::Handle remote_handle,
-#endif
-    const gfx::Size& damage_view_size,
-    float scale_factor) {
+    const BrowserPluginHostMsg_ResizeGuest_Params& params) {
   ++damage_buffer_call_count_;
-  last_damage_buffer_size_ = damage_view_size;
+  last_damage_buffer_size_ = params.view_size;
 
   if (waiting_for_damage_buffer_with_size_ &&
-      expected_damage_buffer_size_ == damage_view_size &&
+      expected_damage_buffer_size_ == params.view_size &&
       damage_buffer_message_loop_runner_) {
     damage_buffer_message_loop_runner_->Quit();
     waiting_for_damage_buffer_with_size_ = false;
   }
 
-  BrowserPluginGuest::SetDamageBuffer(
-      damage_buffer,
-#if defined(OS_WIN)
-      damage_buffer_size,
-      remote_handle,
-#endif
-      damage_view_size,
-      scale_factor);
+  BrowserPluginGuest::SetDamageBuffer(params);
 }
 
 void TestBrowserPluginGuest::DidStopLoading(
     RenderViewHost* render_view_host) {
   BrowserPluginGuest::DidStopLoading(render_view_host);
   load_stop_observed_ = true;
   if (load_stop_message_loop_runner_)
     load_stop_message_loop_runner_->Quit();
 }
 
 }  // namespace content