Remove last dependencies on ui/base from ui/gfx

ui/gfx/codec/png_codec.h

 // Copyright (c) 2011 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.
 
 #ifndef UI_GFX_CODEC_PNG_CODEC_H_
 #define UI_GFX_CODEC_PNG_CODEC_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "ui/gfx/gfx_export.h"
 
 class SkBitmap;
 
 namespace gfx {
 
 class Size;
 
 // Interface for encoding and decoding PNG data. This is a wrapper around
 // libpng, which has an inconvenient interface for callers. This is currently
 // designed for use in tests only (where we control the files), so the handling
 // isn't as robust as would be required for a browser (see Decode() for more).
 // WebKit has its own more complicated PNG decoder which handles, among other
 // things, partially downloaded data.
-class UI_EXPORT PNGCodec {
+class GFX_EXPORT PNGCodec {
  public:
   enum ColorFormat {
     // 3 bytes per pixel (packed), in RGB order regardless of endianness.
     // This is the native JPEG format.
     FORMAT_RGB,
 
     // 4 bytes per pixel, in RGBA order in memory regardless of endianness.
     FORMAT_RGBA,
 
     // 4 bytes per pixel, in BGRA order in memory regardless of endianness.
     // This is the default Windows DIB order.
     FORMAT_BGRA,
 
     // 4 bytes per pixel, in pre-multiplied kARGB_8888_Config format. For use
     // with directly writing to a skia bitmap.
     FORMAT_SkBitmap
   };
 
   // Represents a comment in the tEXt ancillary chunk of the png.
-  struct UI_EXPORT Comment {
+  struct GFX_EXPORT Comment {
     Comment(const std::string& k, const std::string& t);
     ~Comment();
 
     std::string key;
     std::string text;
   };
 
   // Encodes the given raw 'input' data, with each pixel being represented as
   // given in 'format'. The encoded PNG data will be written into the supplied
   // vector and true will be returned on success. On failure (false), the
@@ skipping 62 matching lines @@
   static SkBitmap* CreateSkBitmapFromBGRAFormat(
       const std::vector<unsigned char>& bgra, int width, int height);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PNGCodec);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_CODEC_PNG_CODEC_H_