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

skia/ext/vector_canvas_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 "build/build_config.h"
 
 #include "webkit/tools/test_shell/image_decoder_unittest.h"
 
 #if !defined(OS_WIN)
 #include <unistd.h>
 #endif
 
 #include "PNGImageDecoder.h"
 
+#include "app/gfx/codec/png_codec.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/png_encoder.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "skia/ext/vector_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkDashPathEffect.h"
 
 namespace skia {
 
 namespace {
 
@@ skipping 80 matching lines @@
     SetSkBitmap(bitmap);
   }
 
   int width() const { return width_; }
   int height() const { return height_; }
   int row_length() const { return row_length_; }
 
   // Save the image to a png file. Used to create the initial test files.
   void SaveToFile(const std::wstring& filename) {
     std::vector<unsigned char> compressed;
-    ASSERT_TRUE(PNGEncoder::Encode(&*data_.begin(),
-                                   PNGEncoder::FORMAT_BGRA,
-                                   width_,
-                                   height_,
-                                   row_length_,
-                                   true,
-                                   &compressed));
+    ASSERT_TRUE(gfx::PNGCodec::Encode(&*data_.begin(),
+                                      gfx::PNGCodec::FORMAT_BGRA,
+                                      width_,
+                                      height_,
+                                      row_length_,
+                                      true,
+                                      &compressed));
     ASSERT_TRUE(compressed.size());
     FILE* f = file_util::OpenFile(filename, "wb");
     ASSERT_TRUE(f);
     ASSERT_EQ(fwrite(&*compressed.begin(), 1, compressed.size(), f),
               compressed.size());
     file_util::CloseFile(f);
   }
 
   // Returns the percentage of the image that is different from the other,
   // between 0 and 100.
@@ skipping 820 matching lines @@
   {
     vcanvas_->rotate(67);
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(L"rotate"));
   }
 }
 
 }  // namespace skia