Remove software paint path from WebTestProxy

content/shell/renderer/webkit_test_runner.cc

Index: content/shell/renderer/webkit_test_runner.cc
diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc
index a3ebe922de47ea1734478a531c540dccfdff2ab2..173d0b346f6bdaf9a39b104f5b91beb01e8d88ab 100644
--- a/content/shell/renderer/webkit_test_runner.cc
+++ b/content/shell/renderer/webkit_test_runner.cc
@@ -98,32 +98,6 @@ void InvokeTaskHelper(void* context) {
   delete task;
 }
 
-#if !defined(OS_MACOSX)
-void MakeBitmapOpaque(SkBitmap* bitmap) {
-  SkAutoLockPixels lock(*bitmap);
-  DCHECK_EQ(bitmap->config(), SkBitmap::kARGB_8888_Config);
-  for (int y = 0; y < bitmap->height(); ++y) {
-    uint32_t* row = bitmap->getAddr32(0, y);
-    for (int x = 0; x < bitmap->width(); ++x)
-      row[x] |= 0xFF000000;  // Set alpha bits to 1.
-  }
-}
-#endif
-
-void CopyCanvasToBitmap(SkCanvas* canvas,  SkBitmap* snapshot) {
-  SkBaseDevice* device = skia::GetTopDevice(*canvas);
-  const SkBitmap& bitmap = device->accessBitmap(false);
-  const bool success = bitmap.copyTo(snapshot, kPMColor_SkColorType);
-  DCHECK(success);
-
-#if !defined(OS_MACOSX)
-  // Only the expected PNGs for Mac have a valid alpha channel.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableOverlayFullscreenVideo))
-    MakeBitmapOpaque(snapshot);
-#endif
-}
-
 class SyncNavigationStateVisitor : public RenderViewVisitor {
  public:
   SyncNavigationStateVisitor() {}
@@ -649,15 +623,9 @@ void WebKitTestRunner::CaptureDump() {
 
     if (test_config_.enable_pixel_dumping &&
         interfaces->testRunner()->shouldGeneratePixelResults()) {
-      // TODO(danakj): Remove when kForceCompositingMode is everywhere.
-      if (!render_view()->GetWebView()->isAcceleratedCompositingActive()) {
-        SkBitmap snapshot;
-        CopyCanvasToBitmap(proxy()->CapturePixels(), &snapshot);
-        CaptureDumpPixels(snapshot);
-      } else {
-        proxy()->CapturePixelsAsync(base::Bind(
-            &WebKitTestRunner::CaptureDumpPixels, base::Unretained(this)));
-      }
+      CHECK(render_view()->GetWebView()->isAcceleratedCompositingActive());
+      proxy()->CapturePixelsAsync(base::Bind(
+          &WebKitTestRunner::CaptureDumpPixels, base::Unretained(this)));
       return;
     }
   }