Move the JPEG and PNG codecs from base/gfx to app/gfx/codec. Move the classes...

app/gfx/codec/png_codec_unittest.cc

 // Copyright (c) 2006-2008 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 <math.h>
 
-#include "base/gfx/png_encoder.h"
-#include "base/gfx/png_decoder.h"
+#include "app/gfx/codec/png_codec.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
+namespace gfx {
+
 static void MakeRGBImage(int w, int h, std::vector<unsigned char>* dat) {
   dat->resize(w * h * 3);
   for (int y = 0; y < h; y++) {
     for (int x = 0; x < w; x++) {
       unsigned char* org_px = &(*dat)[(y * w + x) * 3];
       org_px[0] = x * 3;      // r
       org_px[1] = x * 3 + 1;  // g
       org_px[2] = x * 3 + 2;  // b
     }
   }
@@ skipping 41 matching lines @@
 
 TEST(PNGCodec, EncodeDecodeRGB) {
   const int w = 20, h = 20;
 
   // create an image with known values
   std::vector<unsigned char> original;
   MakeRGBImage(w, h, &original);
 
   // encode
   std::vector<unsigned char> encoded;
-  EXPECT_TRUE(PNGEncoder::Encode(&original[0], PNGEncoder::FORMAT_RGB, w, h,
+  EXPECT_TRUE(PNGCodec::Encode(&original[0], PNGCodec::FORMAT_RGB, w, h,
                                w * 3, false, &encoded));
 
   // decode, it should have the same size as the original
   std::vector<unsigned char> decoded;
   int outw, outh;
-  EXPECT_TRUE(PNGDecoder::Decode(&encoded[0], encoded.size(),
-                               PNGDecoder::FORMAT_RGB, &decoded,
+  EXPECT_TRUE(PNGCodec::Decode(&encoded[0], encoded.size(),
+                               PNGCodec::FORMAT_RGB, &decoded,
                                &outw, &outh));
   ASSERT_EQ(w, outw);
   ASSERT_EQ(h, outh);
   ASSERT_EQ(original.size(), decoded.size());
 
   // Images must be equal
   ASSERT_TRUE(original == decoded);
 }
 
 TEST(PNGCodec, EncodeDecodeRGBA) {
   const int w = 20, h = 20;
 
   // create an image with known values, a must be opaque because it will be
   // lost during encoding
   std::vector<unsigned char> original;
   MakeRGBAImage(w, h, true, &original);
 
   // encode
   std::vector<unsigned char> encoded;
-  EXPECT_TRUE(PNGEncoder::Encode(&original[0], PNGEncoder::FORMAT_RGBA, w, h,
+  EXPECT_TRUE(PNGCodec::Encode(&original[0], PNGCodec::FORMAT_RGBA, w, h,
                                w * 4, false, &encoded));
 
   // decode, it should have the same size as the original
   std::vector<unsigned char> decoded;
   int outw, outh;
-  EXPECT_TRUE(PNGDecoder::Decode(&encoded[0], encoded.size(),
-                               PNGDecoder::FORMAT_RGBA, &decoded,
+  EXPECT_TRUE(PNGCodec::Decode(&encoded[0], encoded.size(),
+                               PNGCodec::FORMAT_RGBA, &decoded,
                                &outw, &outh));
   ASSERT_EQ(w, outw);
   ASSERT_EQ(h, outh);
   ASSERT_EQ(original.size(), decoded.size());
 
   // Images must be exactly equal
   ASSERT_TRUE(original == decoded);
 }
 
 // Test that corrupted data decompression causes failures.
 TEST(PNGCodec, DecodeCorrupted) {
   int w = 20, h = 20;
 
   // Make some random data (an uncompressed image).
   std::vector<unsigned char> original;
   MakeRGBImage(w, h, &original);
 
   // It should fail when given non-JPEG compressed data.
   std::vector<unsigned char> output;
   int outw, outh;
-  EXPECT_FALSE(PNGDecoder::Decode(&original[0], original.size(),
-                                PNGDecoder::FORMAT_RGB, &output,
+  EXPECT_FALSE(PNGCodec::Decode(&original[0], original.size(),
+                                PNGCodec::FORMAT_RGB, &output,
                                 &outw, &outh));
 
   // Make some compressed data.
   std::vector<unsigned char> compressed;
-  EXPECT_TRUE(PNGEncoder::Encode(&original[0], PNGEncoder::FORMAT_RGB, w, h,
+  EXPECT_TRUE(PNGCodec::Encode(&original[0], PNGCodec::FORMAT_RGB, w, h,
                                w * 3, false, &compressed));
 
   // Try decompressing a truncated version.
-  EXPECT_FALSE(PNGDecoder::Decode(&compressed[0], compressed.size() / 2,
-                                PNGDecoder::FORMAT_RGB, &output,
+  EXPECT_FALSE(PNGCodec::Decode(&compressed[0], compressed.size() / 2,
+                                PNGCodec::FORMAT_RGB, &output,
                                 &outw, &outh));
 
   // Corrupt it and try decompressing that.
   for (int i = 10; i < 30; i++)
     compressed[i] = i;
-  EXPECT_FALSE(PNGDecoder::Decode(&compressed[0], compressed.size(),
-                                PNGDecoder::FORMAT_RGB, &output,
+  EXPECT_FALSE(PNGCodec::Decode(&compressed[0], compressed.size(),
+                                PNGCodec::FORMAT_RGB, &output,
                                 &outw, &outh));
 }
 
 TEST(PNGCodec, EncodeDecodeBGRA) {
   const int w = 20, h = 20;
 
   // Create an image with known values, alpha must be opaque because it will be
   // lost during encoding.
   std::vector<unsigned char> original;
   MakeRGBAImage(w, h, true, &original);
 
   // Encode.
   std::vector<unsigned char> encoded;
-  EXPECT_TRUE(PNGEncoder::Encode(&original[0], PNGEncoder::FORMAT_BGRA, w, h,
+  EXPECT_TRUE(PNGCodec::Encode(&original[0], PNGCodec::FORMAT_BGRA, w, h,
                                w * 4, false, &encoded));
 
   // Decode, it should have the same size as the original.
   std::vector<unsigned char> decoded;
   int outw, outh;
-  EXPECT_TRUE(PNGDecoder::Decode(&encoded[0], encoded.size(),
-                               PNGDecoder::FORMAT_BGRA, &decoded,
+  EXPECT_TRUE(PNGCodec::Decode(&encoded[0], encoded.size(),
+                               PNGCodec::FORMAT_BGRA, &decoded,
                                &outw, &outh));
   ASSERT_EQ(w, outw);
   ASSERT_EQ(h, outh);
   ASSERT_EQ(original.size(), decoded.size());
 
   // Images must be exactly equal.
   ASSERT_TRUE(original == decoded);
 }
 
 TEST(PNGCodec, StripAddAlpha) {
   const int w = 20, h = 20;
 
   // These should be the same except one has a 0xff alpha channel.
   std::vector<unsigned char> original_rgb;
   MakeRGBImage(w, h, &original_rgb);
   std::vector<unsigned char> original_rgba;
   MakeRGBAImage(w, h, false, &original_rgba);
 
   // Encode RGBA data as RGB.
   std::vector<unsigned char> encoded;
-  EXPECT_TRUE(PNGEncoder::Encode(&original_rgba[0],
-                                 PNGEncoder::FORMAT_RGBA,
-                                 w, h,
-                                 w * 4, true, &encoded));
+  EXPECT_TRUE(PNGCodec::Encode(&original_rgba[0],
+                               PNGCodec::FORMAT_RGBA,
+                               w, h,
+                               w * 4, true, &encoded));
 
   // Decode the RGB to RGBA.
   std::vector<unsigned char> decoded;
   int outw, outh;
-  EXPECT_TRUE(PNGDecoder::Decode(&encoded[0], encoded.size(),
-                               PNGDecoder::FORMAT_RGBA, &decoded,
+  EXPECT_TRUE(PNGCodec::Decode(&encoded[0], encoded.size(),
+                               PNGCodec::FORMAT_RGBA, &decoded,
                                &outw, &outh));
 
   // Decoded and reference should be the same (opaque alpha).
   ASSERT_EQ(w, outw);
   ASSERT_EQ(h, outh);
   ASSERT_EQ(original_rgba.size(), decoded.size());
   ASSERT_TRUE(original_rgba == decoded);
 
   // Encode RGBA to RGBA.
-  EXPECT_TRUE(PNGEncoder::Encode(&original_rgba[0],
-                                 PNGEncoder::FORMAT_RGBA,
-                                 w, h,
-                                 w * 4, false, &encoded));
+  EXPECT_TRUE(PNGCodec::Encode(&original_rgba[0],
+                               PNGCodec::FORMAT_RGBA,
+                               w, h,
+                               w * 4, false, &encoded));
 
   // Decode the RGBA to RGB.
-  EXPECT_TRUE(PNGDecoder::Decode(&encoded[0], encoded.size(),
-                               PNGDecoder::FORMAT_RGB, &decoded,
+  EXPECT_TRUE(PNGCodec::Decode(&encoded[0], encoded.size(),
+                               PNGCodec::FORMAT_RGB, &decoded,
                                &outw, &outh));
 
   // It should be the same as our non-alpha-channel reference.
   ASSERT_EQ(w, outw);
   ASSERT_EQ(h, outh);
   ASSERT_EQ(original_rgb.size(), decoded.size());
   ASSERT_TRUE(original_rgb == decoded);
 }
 
 TEST(PNGCodec, EncodeBGRASkBitmap) {
   const int w = 20, h = 20;
 
   SkBitmap original_bitmap;
   MakeTestSkBitmap(w, h, &original_bitmap);
 
   // Encode the bitmap.
   std::vector<unsigned char> encoded;
-  PNGEncoder::EncodeBGRASkBitmap(original_bitmap, false, &encoded);
+  PNGCodec::EncodeBGRASkBitmap(original_bitmap, false, &encoded);
 
   // Decode the encoded string.
   SkBitmap decoded_bitmap;
-  EXPECT_TRUE(PNGDecoder::Decode(&encoded, &decoded_bitmap));
+  EXPECT_TRUE(PNGCodec::Decode(&encoded, &decoded_bitmap));
 
   // Compare the original bitmap and the output bitmap. We use ColorsClose
   // as SkBitmaps are considered to be pre-multiplied, the unpremultiplication
   // (in Encode) and repremultiplication (in Decode) can be lossy.
   for (int x = 0; x < w; x++) {
     for (int y = 0; y < h; y++) {
       uint32_t original_pixel = original_bitmap.getAddr32(0, y)[x];
       uint32_t decoded_pixel = decoded_bitmap.getAddr32(0, y)[x];
       EXPECT_TRUE(ColorsClose(original_pixel, decoded_pixel));
     }
   }
 }
 
+}  // namespace gfx