Move headers in include/utils/win to src/utils/win.

gyp/utils.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Include this gypi to include all 'utils' files
 # The parent gyp/gypi file must define
 #       'skia_src_path'     e.g. skia/trunk/src
 #       'skia_include_path' e.g. skia/trunk/include
 #
 # The skia build defines these in common_variables.gypi
@@ skipping 75 matching lines @@
         '<(skia_src_path)/utils/SkThreadUtils_pthread.h',
         '<(skia_src_path)/utils/SkThreadUtils_win.cpp',
         '<(skia_src_path)/utils/SkThreadUtils_win.h',
         '<(skia_src_path)/utils/SkWhitelistTypefaces.cpp',
 
         #mac
         '<(skia_include_path)/utils/mac/SkCGUtils.h',
         '<(skia_src_path)/utils/mac/SkCreateCGImageRef.cpp',
 
         #windows
-        '<(skia_include_path)/utils/win/SkAutoCoInitialize.h',
-        '<(skia_include_path)/utils/win/SkHRESULT.h',
-        '<(skia_include_path)/utils/win/SkIStream.h',
-        '<(skia_include_path)/utils/win/SkTScopedComPtr.h',
+        '<(skia_src_path)/utils/win/SkAutoCoInitialize.h',
         '<(skia_src_path)/utils/win/SkAutoCoInitialize.cpp',
         '<(skia_src_path)/utils/win/SkDWrite.h',
         '<(skia_src_path)/utils/win/SkDWrite.cpp',
         '<(skia_src_path)/utils/win/SkDWriteFontFileStream.cpp',
         '<(skia_src_path)/utils/win/SkDWriteFontFileStream.h',
         '<(skia_src_path)/utils/win/SkDWriteGeometrySink.cpp',
         '<(skia_src_path)/utils/win/SkDWriteGeometrySink.h',
+        '<(skia_src_path)/utils/win/SkHRESULT.h',
         '<(skia_src_path)/utils/win/SkHRESULT.cpp',
+        '<(skia_src_path)/utils/win/SkIStream.h',
         '<(skia_src_path)/utils/win/SkIStream.cpp',
+        '<(skia_src_path)/utils/win/SkTScopedComPtr.h',
         '<(skia_src_path)/utils/win/SkWGL.h',
         '<(skia_src_path)/utils/win/SkWGL_win.cpp',
 
         #testing
         '<(skia_src_path)/fonts/SkGScalerContext.cpp',
         '<(skia_src_path)/fonts/SkGScalerContext.h',
         '<(skia_src_path)/fonts/SkRandomScalerContext.cpp',
         '<(skia_src_path)/fonts/SkRandomScalerContext.h',
         '<(skia_src_path)/fonts/SkTestScalerContext.cpp',
         '<(skia_src_path)/fonts/SkTestScalerContext.h',
     ],
 }