Improve Skia configuration.

skia/skia_chrome.gypi

Index: skia/skia_chrome.gypi
===================================================================
--- skia/skia_chrome.gypi	(revision 229411)
+++ skia/skia_chrome.gypi	(working copy)
@@ -20,10 +20,6 @@
     ],
   },
 
-  'include_dirs': [
-    '..',
-  ],
-
   'sources': [
     'ext/analysis_canvas.cc',
     'ext/analysis_canvas.h',
@@ -48,7 +44,6 @@
     'ext/lazy_pixel_ref.h',
     'ext/lazy_pixel_ref_utils.cc',
     'ext/lazy_pixel_ref_utils.h',
-    'ext/SkThread_chrome.cc',
     'ext/opacity_draw_filter.cc',
     'ext/opacity_draw_filter.h',
     'ext/paint_simplifier.cc',
@@ -83,14 +78,6 @@
     'ext/vector_platform_device_skia.h',
   ],
   'conditions': [
-    # For POSIX platforms, prefer the Mutex implementation provided by Skia
-    # since it does not generate static initializers.
-    # TODO: should check if SK_USE_POSIX_THREADS is defined instead
-    [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
-      'sources!': [
-        'ext/SkThread_chrome.cc',
-      ],
-    }],
     [ 'OS == "android" and enable_printing == 0', {
       'sources!': [
         'ext/skia_utils_base.cc',
@@ -105,11 +92,6 @@
         'skia_chrome_opts',
       ],
     }],
-    [ 'OS == "win"', {
-      'sources!': [
-        'ext/SkThread_chrome.cc',
-      ],
-    }],
     # TODO(scottmg): http://crbug.com/177306
     ['clang==1', {
       'xcode_settings': {