[content shell] Add support for layout tests using content_shell on Android (first step).

content/shell/layout_test_controller_host.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/shell/layout_test_controller_host.h"
 
 #include "base/message_loop.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/shell/shell_messages.h"
 #include "webkit/support/webkit_support_gfx.h"
@@ skipping 98 matching lines @@
   printf("%s#EOF\n", dump.c_str());
   fprintf(stderr, "#EOF\n");
 
   if (dump_as_text_)
     MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
 void LayoutTestControllerHost::OnImageDump(
     const std::string& actual_pixel_hash,
     const SkBitmap& image) {
-#if !defined(OS_ANDROID)
-  // DumpRenderTree is not currently supported for Android. Also, on Android
-  // the required webkit_support methods are not defined, so this method just
-  // doesn't compile.
-
   SkAutoLockPixels image_lock(image);
 
   printf("\nActualHash: %s\n", actual_pixel_hash.c_str());
   if (!expected_pixel_hash_.empty())
     printf("\nExpectedHash: %s\n", expected_pixel_hash_.c_str());
 
   // Only encode and dump the png if the hashes don't match. Encoding the
   // image is really expensive.
   if (actual_pixel_hash != expected_pixel_hash_) {
     std::vector<unsigned char> png;
 
     // Only the expected PNGs for Mac have a valid alpha channel.
 #if defined(OS_MACOSX)
     bool discard_transparency = false;
 #else
     bool discard_transparency = true;
 #endif
 
-    if (webkit_support::EncodeBGRAPNGWithChecksum(
-            reinterpret_cast<const unsigned char*>(image.getPixels()),
-            image.width(),
-            image.height(),
-            static_cast<int>(image.rowBytes()),
-            discard_transparency,
-            actual_pixel_hash,
-            &png)) {
+    bool success = false;
+#if defined(OS_ANDROID)
+    success = webkit_support::EncodeRGBAPNGWithChecksum(
+        reinterpret_cast<const unsigned char*>(image.getPixels()),
+        image.width(),
+        image.height(),
+        static_cast<int>(image.rowBytes()),
+        discard_transparency,
+        actual_pixel_hash,
+        &png);
+#else
+    success = webkit_support::EncodeBGRAPNGWithChecksum(
+        reinterpret_cast<const unsigned char*>(image.getPixels()),
+        image.width(),
+        image.height(),
+        static_cast<int>(image.rowBytes()),
+        discard_transparency,
+        actual_pixel_hash,
+        &png);
+#endif
+    if (success) {
       printf("Content-Type: image/png\n");
       printf("Content-Length: %u\n", static_cast<unsigned>(png.size()));
       fwrite(&png[0], 1, png.size(), stdout);
     }
   }
 
   MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
-#endif
 }
 
 void LayoutTestControllerHost::OnNotifyDone() {
   if (!wait_until_done_)
     return;
   watchdog_.Cancel();
   CaptureDump();
 }
 
 void LayoutTestControllerHost::OnDumpAsText() {
@@ skipping 32 matching lines @@
     return;
   printf("FAIL: NOT IMPLEMENTED: %s.%s\n",
          object_name.c_str(), property_name.c_str());
   fprintf(stderr, "FAIL: NOT IMPLEMENTED: %s.%s\n",
           object_name.c_str(), property_name.c_str());
   watchdog_.Cancel();
   CaptureDump();
 }
 
 }  // namespace content