Revert of Roll third_party/freetype-android/src to VER-2-6-2. (patchset #2 id:20001 of https://codereview.chromium.org/1518643003/ )

Reason for revert:
This is still breaking the WebKit Android (Nexus4) bot:
https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Android%20%28Nexus4%29/builds/42306

Failing tests (in case link goes dead):
webkit_tests
unexpected_failures:
css1/classification/list_style.html
svg/W3C-SVG-1.1-SE/coords-dom-02-f.svg
css1/formatting_model/horizontal_formatting.html
css1/formatting_model/canvas.html
css1/cascade/important.html
css1/font_properties/font_style.html
css1/font_properties/font_variant.html
css1/color_and_background/background_color.html
css1/classification/list_style_position.html
svg/batik/text/textAnchor3.svg
fast/text/chromium-linux-fontconfig-renderstyle.html
svg/canvas/canvas-pattern-svg.html
css1/color_and_background/color.html
fast/hidpi/clip-text-in-hidpi.html
editing/caret/caret-color.html
css1/classification/list_style_image.html
css1/text_properties/text_align.html
fast/invalid/009.html
fast/compact/002.html

Original issue's description:
> Roll third_party/freetype-android/src to VER-2-6-2.
>
> https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/30fe5e762e06261..66cf29b1bc869b
>
> This updates from VER-2-6-1 + 1 to VER-2-6-2.
>
> It is expected that this will change the weight of CFF fonts.
> If this becomes undesireable, there is a patch which can be applied.
>
> BUG=chromium:551028
>
> Committed: https://crrev.com/a7a845a523c9f2f3c481ec99c0c35646f9e5ea7f
> Cr-Commit-Position: refs/heads/master@{#364438}
>
> Committed: https://crrev.com/89e75f4d6c033ba5904cc808feb1292e8f211120
> Cr-Commit-Position: refs/heads/master@{#364723}

TBR=jshin@chromium.org,wangxianzhu@chromium.org,bungeman@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:551028

Review URL: https://codereview.chromium.org/1517033004

Cr-Commit-Position: refs/heads/master@{#364769}

4 files changed, 10 insertions, 50 deletions

diff --git a/DEPS b/DEPS
index ccd1305..2732a3c 100644
--- a/DEPS
+++ b/DEPS
@@ -444,7 +444,7 @@ deps_os = {
      Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '57f05238d3ac77ea0a194813d3065dd780c6e566',
 
     'src/third_party/freetype-android/src':
-     Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + '66cf29b1bc869b44863b0de2115bd017dfcce849',
+     Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + '30fe5e762e062612fdf4b56b50d813525a5aa311',
 
    'src/third_party/elfutils/src':
      Var('chromium_git') + '/external/elfutils.git' + '@' + '249673729a7e5dbd5de4f3760bdcaa3d23d154d7',
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index f57da4d..0c3a023 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1290,26 +1290,6 @@ crbug.com/568875 inspector/console/console-format-collections.html [ NeedsManual
 
 crbug.com/524646 [ Mac10.10 ] fast/dom/shadow/shadowdom-for-button.html [ Failure ]
 
-crbug.com/551028 [ Android ] css1/classification/list_style.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] svg/W3C-SVG-1.1-SE/coords-dom-02-f.svg [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] css1/formatting_model/horizontal_formatting.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] css1/formatting_model/canvas.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] css1/cascade/important.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] css1/font_properties/font_style.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] css1/font_properties/font_variant.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] css1/color_and_background/background_color.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] css1/classification/list_style_position.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] svg/batik/text/textAnchor3.svg [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] fast/text/chromium-linux-fontconfig-renderstyle.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] svg/canvas/canvas-pattern-svg.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] css1/color_and_background/color.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] fast/hidpi/clip-text-in-hidpi.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] editing/caret/caret-color.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] css1/classification/list_style_image.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] css1/text_properties/text_align.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] fast/invalid/009.html [ NeedsRebaseline ]
-crbug.com/551028 [ Android ] fast/compact/002.html [ NeedsRebaseline ]
-
 crbug.com/538717 [ Win Mac Linux ] http/tests/permissions/chromium/test-request-multiple-window.html [ Failure Pass Timeout ]
 crbug.com/538717 [ Win Mac Linux ] http/tests/permissions/chromium/test-request-multiple-worker.html [ Failure Pass Timeout ]
 crbug.com/538717 [ Win Mac Linux ] http/tests/permissions/chromium/test-request-multiple-sharedworker.html [ Failure Pass Timeout ]
diff --git a/third_party/freetype-android/README.chromium b/third_party/freetype-android/README.chromium
index 126a660..b4adfad 100644
--- a/third_party/freetype-android/README.chromium
+++ b/third_party/freetype-android/README.chromium
@@ -1,7 +1,7 @@
 Name: FreeType
 URL: http://www.freetype.org/
-Version: VER-2-6-2
-Revision: 66cf29b1bc869b44863b0de2115bd017dfcce849
+Version: VER-2-6-1-updates
+Revision: 30fe5e762e062612fdf4b56b50d813525a5aa311
 License: Custom license "inspired by the BSD, Artistic, and IJG (Independent
          JPEG Group) licenses"
 License File: src/docs/FTL.TXT
@@ -21,8 +21,6 @@ How to update:
    FreeType tag being branched and commit changes there.
 2. Update freetype.gyp and BUILD.gn to reflect any changes. These should be kept
    in sync with the Android.mk for FreeType in Android as possible.
-3. Merge the new src/include/freetype/config/ftoption.h into
-   include/freetype-android-config/ftoption.h .
-4. Update this file.
-5. Commit build changes while rolling Chromium's freetype-android DEPS to the
+3. Update this file.
+4. Commit build changes while rolling Chromium's freetype-android DEPS to the
    new commit.
diff --git a/third_party/freetype-android/include/freetype-android-config/ftoption.h b/third_party/freetype-android/include/freetype-android-config/ftoption.h
index 2e83cf0..2499196 100644
--- a/third_party/freetype-android/include/freetype-android-config/ftoption.h
+++ b/third_party/freetype-android/include/freetype-android-config/ftoption.h
@@ -38,9 +38,9 @@ FT_BEGIN_HEADER
   /*    library from a single source directory.                            */
   /*                                                                       */
   /*  - You can put a copy of this file in your build directory, more      */
-  /*    precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD'   */
-  /*    is the name of a directory that is included _before_ the FreeType  */
-  /*    include path during compilation.                                   */
+  /*    precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the     */
+  /*    name of a directory that is included _before_ the FreeType include */
+  /*    path during compilation.                                           */
   /*                                                                       */
   /*    The default FreeType Makefiles and Jamfiles use the build          */
   /*    directory `builds/<system>' by default, but you can easily change  */
@@ -51,7 +51,7 @@ FT_BEGIN_HEADER
   /*    locate this file during the build.  For example,                   */
   /*                                                                       */
   /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
-  /*      #include <freetype/config/ftheader.h>                            */
+  /*      #include <config/ftheader.h>                                     */
   /*                                                                       */
   /*    will use `$BUILD/myftoptions.h' instead of this file for macro     */
   /*    definitions.                                                       */
@@ -59,7 +59,7 @@ FT_BEGIN_HEADER
   /*    Note also that you can similarly pre-define the macro              */
   /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
   /*    that are statically linked to the library at compile time.  By     */
-  /*    default, this file is <freetype/config/ftmodule.h>.                */
+  /*    default, this file is <config/ftmodule.h>.                         */
   /*                                                                       */
   /* We highly recommend using the third method whenever possible.         */
   /*                                                                       */
@@ -693,24 +693,6 @@ FT_BEGIN_HEADER
 
 
   /*************************************************************************/
-  /*                                                                       */
-  /* Option TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES controls the maximum     */
-  /* number of bytecode instructions executed for a single run of the      */
-  /* bytecode interpreter, needed to prevent infinite loops.  You don't    */
-  /* want to change this except for very special situations (e.g., making  */
-  /* a library fuzzer spend less time to handle broken fonts).             */
-  /*                                                                       */
-  /* It is not expected that this value is ever modified by a configuring  */
-  /* script; instead, it gets surrounded with #ifndef ... #endif so that   */
-  /* the value can be set as a preprocessor option on the compiler's       */
-  /* command line.                                                         */
-  /*                                                                       */
-#ifndef TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES
-#define TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES  1000000L
-#endif
-
-
-  /*************************************************************************/
   /*************************************************************************/
   /****                                                                 ****/
   /****      T Y P E 1   D R I V E R    C O N F I G U R A T I O N       ****/