Move simple png encoding for image_diff into tools/

content/shell/webkit_test_controller.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/webkit_test_controller.h"
 
 #include <iostream>
 
 #include "base/base64.h"
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/common/webkit_test_helpers.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_content_browser_client.h"
-#include "webkit/support/webkit_support_gfx.h"
+#include "ui/gfx/codec/png_codec.h"
 
 namespace content {
 
 const int kTestSVGWindowWidthDip = 480;
 const int kTestSVGWindowHeightDip = 360;
 
 // WebKitTestResultPrinter ----------------------------------------------------
 
 WebKitTestResultPrinter::WebKitTestResultPrinter(
     std::ostream* output, std::ostream* error)
@@ skipping 461 matching lines @@
   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
 
-    bool success = webkit_support::EncodeBGRAPNGWithChecksum(
-        reinterpret_cast<const unsigned char*>(image.getPixels()),
-        image.width(),
-        image.height(),
+    std::vector<gfx::PNGCodec::Comment> comments;
+    comments.push_back(gfx::PNGCodec::Comment("checksum", actual_pixel_hash));
+    bool success = gfx::PNGCodec::Encode(
+        static_cast<const unsigned char*>(image.getPixels()),
+        gfx::PNGCodec::FORMAT_BGRA,
+        gfx::Size(image.width(), image.height()),
         static_cast<int>(image.rowBytes()),
         discard_transparency,
-        actual_pixel_hash,
+        comments,
         &png);
     if (success)
       printer_->PrintImageBlock(png);
   }
   printer_->PrintImageFooter();
 }
 
 void WebKitTestController::OnAudioDump(const std::vector<unsigned char>& dump) {
   printer_->PrintAudioHeader();
   printer_->PrintAudioBlock(dump);
@@ skipping 89 matching lines @@
   }
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 void WebKitTestController::OnResetDone() {
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
 }
 
 }  // namespace content