Roll chromium_revision e937e5f..c2239a8 (333350:334133)

sync_chromium.py

Index: sync_chromium.py
diff --git a/sync_chromium.py b/sync_chromium.py
index 3f366522e0408df472b97887292261c87b210cde..442ddcde91fee1d808d7807b739b1358557201e0 100755
--- a/sync_chromium.py
+++ b/sync_chromium.py
@@ -24,6 +24,7 @@ incremented. The file can be removed manually to force a new sync.
 
 import argparse
 import os
+import shutil
 import subprocess
 import sys
 import textwrap
@@ -105,6 +106,14 @@ def main():
 
   env = os.environ.copy()
 
+  # Workaround to avoid sync failure due move in
+  # https://codereview.chromium.org/1155743013
+  # TODO(kjellander): Remove this after the summer of 2015.
+  freetype_src = os.path.join(CR_DIR, 'src', 'third_party', 'freetype-android',
+                              'src')
+  if os.path.isdir(freetype_src):
+    shutil.rmtree(freetype_src)
+
   # Avoid downloading NaCl toolchain as part of the Chromium hooks.
   env.setdefault('GYP_DEFINES', '')
   env['GYP_DEFINES'] += ' disable_nacl=1'