Reverting r148671, r149866 (broke VS2008 builder) and r150361 (broke ninja).

skia/skia.gyp

 # Copyright (c) 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(component)',
       'variables': {
@@ skipping 806 matching lines @@
         '../third_party/skia/src/core',
         '../third_party/skia/src/gpu',
         '../third_party/skia/src/sfnt',
         '../third_party/skia/src/utils',
       ],
       'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4800],
       'defines': [
         'SK_GAMMA_SRGB',
         #'SK_GAMMA_APPLY_TO_A8',
         'SK_BUILD_NO_IMAGE_ENCODE',
-        # TODO(alexeypa): fix quoting in the skia sources,
-        # see http://crbug.com/141132.
-        'GR_GL_CUSTOM_SETUP_HEADER=<GrGLConfig_chrome.h>',
+        'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
         'GR_STATIC_RECT_VB=1',
         'GR_AGGRESSIVE_SHADER_OPTS=1',
         'SK_DISABLE_FAST_AA_STROKE_RECT',
         'SK_DEFERRED_CANVAS_USES_GPIPE=1',
         
         # this flag can be removed entirely once this has baked for a while
         'SK_ALLOW_OVER_32K_BITMAPS',
 
         # temporary for landing Skia rev 3077 with minimal layout test breakage
         'SK_SIMPLE_TWOCOLOR_VERTICAL_GRADIENTS',
@@ skipping 266 matching lines @@
           '../third_party/skia/include/gpu',
           '../third_party/skia/include/gpu/gl',
           '../third_party/skia/include/pipe',
           '../third_party/skia/include/ports',
           '../third_party/skia/include/utils',
           'ext',
         ],
         'defines': [
           'SK_BUILD_NO_IMAGE_ENCODE',
           'SK_DEFERRED_CANVAS_USES_GPIPE=1',
-          # TODO(alexeypa): fix quoting in the skia sources,
-          # see http://crbug.com/141132.
-          'GR_GL_CUSTOM_SETUP_HEADER=<GrGLConfig_chrome.h>',
+          'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
           'GR_AGGRESSIVE_SHADER_OPTS=1',
         ],
         'conditions': [
           ['OS=="android"', {
             'dependencies!': [
               'skia_opts',
               '../third_party/zlib/zlib.gyp:zlib',
             ],
             'defines': [
               # Don't use non-NDK available stuff.
@@ skipping 212 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }