Collapse ImageSkia.cpp and ImageChromium.cpp into Image.cpp

Source/core/core.gypi

 {
     'variables': {
         'deprecated_perl_core_idl_files': [
             'css/CSS.idl',
             'css/CSSCharsetRule.idl',
             'css/CSSFontFaceLoadEvent.idl',
             'css/CSSFontFaceRule.idl',
             'css/CSSHostRule.idl',
             'css/CSSImportRule.idl',
             'css/CSSMediaRule.idl',
@@ skipping 2824 matching lines @@
             'platform/graphics/chromium/FontCacheAndroid.cpp',
             'platform/graphics/chromium/FontCacheChromiumLinux.cpp',
             'platform/graphics/chromium/FontCacheChromiumWin.cpp',
             'platform/graphics/chromium/FontChromiumWin.cpp',
             'platform/graphics/chromium/FontPlatformDataChromiumWin.cpp',
             'platform/graphics/chromium/FontPlatformDataChromiumWin.h',
             'platform/graphics/chromium/FontRenderStyle.h',
             'platform/graphics/chromium/FontUtilsChromiumWin.cpp',
             'platform/graphics/chromium/FontUtilsChromiumWin.h',
             'platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp',
-            'platform/graphics/chromium/ImageChromium.cpp',
             'platform/graphics/chromium/ImageDecodingStore.cpp',
             'platform/graphics/chromium/ImageDecodingStore.h',
             'platform/graphics/chromium/ImageFrameGenerator.cpp',
             'platform/graphics/chromium/ImageFrameGenerator.h',
             'platform/graphics/chromium/LazyDecodingPixelRef.cpp',
             'platform/graphics/chromium/LazyDecodingPixelRef.h',
             'platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp',
             'platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.h',
             'platform/graphics/chromium/ScaledImageFragment.cpp',
             'platform/graphics/chromium/ScaledImageFragment.h',
@@ skipping 136 matching lines @@
             'platform/graphics/opentype/OpenTypeTypes.h',
             'platform/graphics/opentype/OpenTypeUtilities.cpp',
             'platform/graphics/opentype/OpenTypeUtilities.h',
             'platform/graphics/opentype/OpenTypeVerticalData.cpp',
             'platform/graphics/opentype/OpenTypeVerticalData.h',
             'platform/graphics/skia/FontCacheSkia.cpp',
             'platform/graphics/skia/FontCustomPlatformData.cpp',
             'platform/graphics/skia/FontCustomPlatformData.h',
             'platform/graphics/skia/FontPlatformDataSkia.cpp',
             'platform/graphics/skia/GlyphPageTreeNodeSkia.cpp',
-            'platform/graphics/skia/ImageSkia.cpp',
             'platform/graphics/skia/NativeImageSkia.cpp',
             'platform/graphics/skia/NativeImageSkia.h',
             'platform/graphics/skia/OpaqueRegionSkia.cpp',
             'platform/graphics/skia/OpaqueRegionSkia.h',
             'platform/graphics/skia/SimpleFontDataSkia.cpp',
             'platform/graphics/skia/SkiaFontWin.cpp',
             'platform/graphics/skia/SkiaFontWin.h',
             'platform/graphics/skia/SkiaSharedBufferStream.cpp',
             'platform/graphics/skia/SkiaSharedBufferStream.h',
             'platform/graphics/skia/SkiaUtils.cpp',
@@ skipping 781 matching lines @@
                 'bison_exe': 'bison',
                 # We specify a preprocess so it happens locally and won't get
                 # distributed to goma.
                 # FIXME: /usr/bin/gcc won't exist on OSX forever. We want to
                 # use /usr/bin/clang once we require Xcode 4.x.
                 'preprocessor': '--preprocessor "/usr/bin/gcc -E -P -x c++"'
               }],
          ],
     }
 }