Merge 149966 "Fix multipart images, regressed in r148560".

Source/core/core.gypi

 {
     'variables': {
         'core_idl_files': [
             'css/CSSCharsetRule.idl',
             'css/CSSFontFaceLoadEvent.idl',
             'css/CSSFontFaceRule.idl',
             'css/CSSHostRule.idl',
             'css/CSSImportRule.idl',
             'css/CSSMediaRule.idl',
             'css/CSSPageRule.idl',
@@ skipping 3635 matching lines @@
             'platform/chromium/support/WebURL.cpp',
             'platform/chromium/support/WebURLError.cpp',
             'platform/chromium/support/WebURLRequest.cpp',
             'platform/chromium/support/WebURLRequestPrivate.h',
             'platform/chromium/support/WebURLResponse.cpp',
             'platform/chromium/support/WebURLResponsePrivate.h',
             'platform/chromium/support/WrappedResourceRequest.h',
             'platform/chromium/support/WrappedResourceResponse.h',
         ],
         'core_unittest_files': [
+            'tests/CachedImageTest.cpp',
             'tests/HeapGraphSerializerTest.cpp',
             'tests/LayoutUnit.cpp',
             'tests/LinkRelAttribute.cpp',
             'tests/WebSocketPerMessageDeflateTest.cpp'
         ],
         'scripts_for_in_files': [
             'scripts/in_file.py',
             'scripts/in_generator.py',
             'scripts/license.py',
         ],
@@ skipping 13 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++"'
               }],
          ],
     }
 }