diff --git a/DEPS b/DEPS
index 00ca5cc0d5..621d577591 100644
--- a/DEPS
+++ b/DEPS
@@ -6,7 +6,7 @@
 vars = {
   'extra_gyp_flag': '-Dextra_gyp_flag=0',
   'chromium_git': 'https://chromium.googlesource.com',
-  'chromium_revision': 'e937e5fb5e6136ef27280fc7aad5502aa5a3cce2',
+  'chromium_revision': 'c2239a84ca03a01bb95d6055d2a6c75b767979fb',
 }
 
 # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
diff --git a/sync_chromium.py b/sync_chromium.py
index 3f366522e0..442ddcde91 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'
diff --git a/talk/build/isolate.gypi b/talk/build/isolate.gypi
index 00c38324a0..13f3d50aff 100644
--- a/talk/build/isolate.gypi
+++ b/talk/build/isolate.gypi
@@ -123,9 +123,6 @@
             '--extra-variable', 'mac_product_name', '<(mac_product_name)',
           ],
         }],
-        ["test_isolation_outdir!=''", {
-          'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
-        }],
       ],
     },
   ],
diff --git a/webrtc/build/isolate.gypi b/webrtc/build/isolate.gypi
index 86169fd094..75189f8ff9 100644
--- a/webrtc/build/isolate.gypi
+++ b/webrtc/build/isolate.gypi
@@ -104,9 +104,6 @@
             '--extra-variable', 'mac_product_name', '<(mac_product_name)',
           ],
         }],
-        ["test_isolation_outdir!=''", {
-          'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
-        }],
       ],
     },
   ],