Apply merge from @fsamuel.

content/browser/browser_plugin/test_browser_plugin_guest.h

 // 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.
 
 #ifndef CONTENT_BROWSER_BROWSER_PLUGIN_TEST_BROWSER_PLUGIN_GUEST_H_
 #define CONTENT_BROWSER_BROWSER_PLUGIN_TEST_BROWSER_PLUGIN_GUEST_H_
 
 #include "base/compiler_specific.h"
 #include "base/process_util.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
@@ skipping 27 matching lines @@
   // Overridden methods from BrowserPluginGuest to intercept in test objects.
   virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
   virtual void HandleInputEvent(RenderViewHost* render_view_host,
                                 const gfx::Rect& guest_window_rect,
                                 const gfx::Rect& guest_screen_rect,
                                 const WebKit::WebInputEvent& event) OVERRIDE;
   virtual void SetFocus(bool focused) OVERRIDE;
   virtual bool ViewTakeFocus(bool reverse) OVERRIDE;
   virtual void Reload() OVERRIDE;
   virtual void Stop() OVERRIDE;
-  virtual void 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) OVERRIDE;
+  virtual void SetDamageBuffer(
+      const BrowserPluginHostMsg_ResizeGuest_Params& params) OVERRIDE;
   virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE;
 
   // Test utilities to wait for a event we are interested in.
   // Waits until UpdateRect message is sent from the guest, meaning it is
   // ready/rendered.
   void WaitForUpdateRectMsg();
   void ResetUpdateRectCount();
   // Waits until a guest receives a damage buffer of the specified |size|.
   void WaitForDamageBufferWithSize(const gfx::Size& size);
   // Waits for focus to reach this guest.
@@ skipping 53 matching lines @@
   scoped_refptr<MessageLoopRunner> input_message_loop_runner_;
   scoped_refptr<MessageLoopRunner> load_stop_message_loop_runner_;
   scoped_refptr<MessageLoopRunner> auto_view_size_message_loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBrowserPluginGuest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_TEST_BROWSER_PLUGIN_GUEST_H_