Apply merge from @fsamuel.

content/renderer/browser_plugin/browser_plugin_backing_store.cc

Index: content/renderer/browser_plugin/browser_plugin_backing_store.cc
===================================================================
--- content/renderer/browser_plugin/browser_plugin_backing_store.cc	(revision 182101)
+++ content/renderer/browser_plugin/browser_plugin_backing_store.cc	(working copy)
@@ -34,7 +34,7 @@
 void BrowserPluginBackingStore::PaintToBackingStore(
     const gfx::Rect& bitmap_rect,
     const std::vector<gfx::Rect>& copy_rects,
-    TransportDIB* dib) {
+    void* bitmap) {
   if (bitmap_rect.IsEmpty())
     return;
 
@@ -48,7 +48,7 @@
       height <= 0 || height > kMaxSize)
     return;
 
-  if (!dib)
+  if (!bitmap)
     return;
 
   SkPaint copy_paint;
@@ -56,7 +56,7 @@
 
   SkBitmap sk_bitmap;
   sk_bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
-  sk_bitmap.setPixels(dib->memory());
+  sk_bitmap.setPixels(bitmap);
   for (size_t i = 0; i < copy_rects.size(); i++) {
     const gfx::Rect& pixel_copy_rect = gfx::ToEnclosingRect(
         gfx::ScaleRect(copy_rects[i], scale_factor_));