Apply merge from @fsamuel.

content/renderer/browser_plugin/mock_browser_plugin.cc

Index: content/renderer/browser_plugin/mock_browser_plugin.cc
===================================================================
--- content/renderer/browser_plugin/mock_browser_plugin.cc	(revision 182101)
+++ content/renderer/browser_plugin/mock_browser_plugin.cc	(working copy)
@@ -12,20 +12,9 @@
     RenderViewImpl* render_view,
     WebKit::WebFrame* frame,
     const WebKit::WebPluginParams& params)
-    : BrowserPlugin(id, render_view, frame, params),
-      transport_dib_next_sequence_number_(0) {
+    : BrowserPlugin(id, render_view, frame, params) {
 }
 
 MockBrowserPlugin::~MockBrowserPlugin() {}
 
-TransportDIB* MockBrowserPlugin::CreateTransportDIB(const size_t size) {
-  return TransportDIB::Create(size, transport_dib_next_sequence_number_++);
-}
-
-void MockBrowserPlugin::FreeDamageBuffer(TransportDIB** damage_buffer) {
-  DCHECK(*damage_buffer);
-  RenderProcess::current()->FreeTransportDIB(*damage_buffer);
-  *damage_buffer = NULL;
-}
-
 }  // namespace content