reland "extract some common code from PictureRenderer"

gyp/tools.gyp

Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 769cf6cd2fcb7690e1d26a93e962a05ab3b48c2d..340f20766bcc5273cfa7613cc191a45cbeeb2383 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -182,7 +182,6 @@
         'gm.gyp:gm_expectations',
         'jsoncpp.gyp:jsoncpp',
         'skia_lib.gyp:skia_lib',

[epoger, 2014/05/08 20:17:14]

Fixed multiple places where this dependency should not have been.

-        'utils.gyp:utils',
       ],
     },
     {
@@ -237,7 +236,6 @@
         'pdf.gyp:pdf',
         'ports.gyp:ports',
         'skia_lib.gyp:skia_lib',
-        'utils.gyp:utils',
       ],
     },
     {
@@ -263,7 +261,6 @@
         'pdf.gyp:pdf',
         'ports.gyp:ports',
         'skia_lib.gyp:skia_lib',
-        'utils.gyp:utils',
       ],
     },
     {
@@ -369,6 +366,8 @@
       'target_name': 'picture_renderer',
       'type': 'static_library',
       'sources': [
+        '../tools/image_expectations.h',
+        '../tools/image_expectations.cpp',
         '../tools/LazyDecodeBitmap.cpp',
         '../tools/PictureRenderer.h',
         '../tools/PictureRenderer.cpp',
@@ -388,7 +387,7 @@
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          # needed for JSON headers used within PictureRenderer.h
+          # needed for JSON headers used within image_expectations.h
           '../third_party/externals/jsoncpp-chromium/overrides/include/',
           '../third_party/externals/jsoncpp/include/',
         ],