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

chrome/common/security_filter_peer.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "chrome/common/security_filter_peer.h"
 
+#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/png_encoder.h"
 #include "base/gfx/size.h"
 #include "base/string_util.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "webkit/glue/webkit_glue.h"
@@ skipping 283 matching lines @@
          x += stamp_bitmap->width() * 2) {
       canvas.drawBitmap(*stamp_bitmap,
                         SkIntToScalar(x),
                         SkIntToScalar(row * stamp_bitmap->height()),
                         &paint);
     }
   }
 
   // Now encode it to a PNG.
   std::vector<unsigned char> output;
-  if (!PNGEncoder::EncodeBGRASkBitmap(canvas.getDevice()->accessBitmap(false),
-                                      false, &output)) {
+  if (!gfx::PNGCodec::EncodeBGRASkBitmap(
+          canvas.getDevice()->accessBitmap(false), false, &output)) {
     return false;
   }
 
   // Copy the vector content to data_ which is a string.
   data_.clear();
   data_.resize(output.size());
   std::copy(output.begin(), output.end(), data_.begin());
 
   return true;
 }