Update from https://crrev.com/320343

skia/skia_library.gypi

 # Copyright 2013 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.
 
 
 # This gypi file contains the Skia library.
 # In component mode (shared_lib) it is folded into a single shared library with
 # the Chrome-specific enhancements but in all other cases it is a separate lib.
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ skipping 50 matching lines @@
     '../third_party/skia/src/ports/SkTLS_pthread.cpp',
     '../third_party/skia/src/ports/SkTLS_win.cpp',
     '../third_party/skia/src/ports/SkTypeface_win_dw.cpp',
     '../third_party/skia/src/ports/SkTypeface_win_dw.h',
 
     '../third_party/skia/src/sfnt/SkOTTable_name.cpp',
     '../third_party/skia/src/sfnt/SkOTTable_name.h',
     '../third_party/skia/src/sfnt/SkOTUtils.cpp',
     '../third_party/skia/src/sfnt/SkOTUtils.h',
 
-    '../third_party/skia/src/utils/debugger/SkDebugCanvas.cpp',
-    '../third_party/skia/src/utils/debugger/SkDebugCanvas.h',
-    '../third_party/skia/src/utils/debugger/SkDrawCommand.cpp',
-    '../third_party/skia/src/utils/debugger/SkDrawCommand.h',
-    '../third_party/skia/src/utils/debugger/SkObjectParser.cpp',
-    '../third_party/skia/src/utils/debugger/SkObjectParser.h',
-
     '../third_party/skia/include/core/SkFontStyle.h',
 
     '../third_party/skia/include/images/SkMovie.h',
     '../third_party/skia/include/images/SkPageFlipper.h',
 
     '../third_party/skia/include/ports/SkFontConfigInterface.h',
     '../third_party/skia/include/ports/SkFontMgr.h',
     '../third_party/skia/include/ports/SkFontMgr_indirect.h',
     '../third_party/skia/include/ports/SkRemotableFontMgr.h',
     '../third_party/skia/include/ports/SkTypeface_win.h',
@@ skipping 265 matching lines @@
           # SkFontHost_mac.cpp uses API deprecated in iOS 7.
           # crbug.com/408571
           '-Wno-deprecated-declarations',
         ],
       },
     }],
   ],
 
   'direct_dependent_settings': {
     'include_dirs': [
-      #temporary until we can hide SkFontHost
-      '../third_party/skia/src/core',
-
       '../third_party/skia/include/core',
       '../third_party/skia/include/effects',
       '../third_party/skia/include/pdf',
       '../third_party/skia/include/gpu',
       '../third_party/skia/include/lazy',
       '../third_party/skia/include/pathops',
       '../third_party/skia/include/pipe',
       '../third_party/skia/include/ports',
       '../third_party/skia/include/utils',
     ],
   },
 }