Fix RGBA pixel layout when reading image from clipboard.

webkit/tools/test_shell/mock_webclipboard_impl.cc

Index: webkit/tools/test_shell/mock_webclipboard_impl.cc
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.cc b/webkit/tools/test_shell/mock_webclipboard_impl.cc
index e21269a9fcd4ccc7742ab6c4b7b6c7ea006c187d..e280e4e89c912a20a11a9e5f690fa4c5a0fd82ca 100644
--- a/webkit/tools/test_shell/mock_webclipboard_impl.cc
+++ b/webkit/tools/test_shell/mock_webclipboard_impl.cc
@@ -105,12 +105,20 @@ WebKit::WebData MockWebClipboardImpl::readImage(
   // for endianess reasons, it will be BGRA8888 on Windows.
   const SkBitmap& bitmap = m_image.getSkBitmap();
   SkAutoLockPixels lock(bitmap);
+#if defined(OS_ANDROID)
+  webkit_support::EncodeRGBAPNG(static_cast<unsigned char*>(bitmap.getPixels()),
+                                bitmap.width(),
+                                bitmap.height(),
+                                bitmap.rowBytes(),
+                                &encoded_image);
+#else
   webkit_support::EncodeBGRAPNG(static_cast<unsigned char*>(bitmap.getPixels()),
                                 bitmap.width(),
                                 bitmap.height(),
                                 bitmap.rowBytes(),
                                 false,
                                 &encoded_image);
+#endif
   data.assign(reinterpret_cast<char*>(vector_as_array(&encoded_image)),
               encoded_image.size());
   return data;