Update from https://crrev.com/318214

third_party/brotli/brotli.gyp

Index: third_party/brotli/brotli.gyp
diff --git a/third_party/brotli/brotli.gyp b/third_party/brotli/brotli.gyp
index e074658194767e721ae1e422b505ef434422d159..e09f0c6cdbad6e2290448f0ffb5142144a5550ab 100644
--- a/third_party/brotli/brotli.gyp
+++ b/third_party/brotli/brotli.gyp
@@ -1,7 +1,6 @@
 # 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.
-# TODO(bashi): Rename this directory to font-compression-reference
 
 {
   'targets': [
@@ -9,45 +8,24 @@
       'target_name': 'brotli',
       'type': 'static_library',
       'include_dirs': [
-        'src/brotli/dec',
+        'dec',
       ],
       'sources': [
-        'src/brotli/dec/bit_reader.c',
-        'src/brotli/dec/bit_reader.h',
-        'src/brotli/dec/context.h',
-        'src/brotli/dec/decode.c',
-        'src/brotli/dec/decode.h',
-        'src/brotli/dec/dictionary.h',
-        'src/brotli/dec/huffman.c',
-        'src/brotli/dec/huffman.h',
-        'src/brotli/dec/prefix.h',
-        'src/brotli/dec/safe_malloc.c',
-        'src/brotli/dec/safe_malloc.h',
-        'src/brotli/dec/streams.c',
-        'src/brotli/dec/streams.h',
-        'src/brotli/dec/transform.h',
-        'src/brotli/dec/types.h',
-      ],
-    },
-    {
-      'target_name': 'woff2_dec',
-      'type': 'static_library',
-      'include_dirs': [
-        'src/brotli/dec',
-        'src/woff2',
-      ],
-      'dependencies': [
-        'brotli',
-      ],
-      'sources': [
-        'src/woff2/buffer.h',
-        'src/woff2/round.h',
-        'src/woff2/store_bytes.h',
-        'src/woff2/table_tags.cc',
-        'src/woff2/table_tags.h',
-        'src/woff2/woff2_common.h',
-        'src/woff2/woff2_dec.cc',
-        'src/woff2/woff2_dec.h',
+        'dec/bit_reader.c',
+        'dec/bit_reader.h',
+        'dec/context.h',
+        'dec/decode.c',
+        'dec/decode.h',
+        'dec/dictionary.h',
+        'dec/huffman.c',
+        'dec/huffman.h',
+        'dec/prefix.h',
+        'dec/safe_malloc.c',
+        'dec/safe_malloc.h',
+        'dec/streams.c',
+        'dec/streams.h',
+        'dec/transform.h',
+        'dec/types.h',
       ],
     },
   ],