diff --git a/DEPS b/DEPS
index 70f1380fd0..3ed9fb24ce 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': '61ed337cfe003bbc8f6619f644e90f95b1bcfd33',
+  'chromium_revision': '21934f358a96ef3596d739d62b85520b6242ff65',
 }
 
 # NOTE: Use http rather than https; the latter can cause problems for users
diff --git a/build_overrides/gtest.gni b/build_overrides/gtest.gni
new file mode 100644
index 0000000000..a64bb7ed5b
--- /dev/null
+++ b/build_overrides/gtest.gni
@@ -0,0 +1,13 @@
+# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+# Include support for registering main function in multi-process tests.
+gtest_include_multiprocess = true
+
+# Include support for platform-specific operations across unit tests.
+gtest_include_platform_test = true