diff --git a/.gitignore b/.gitignore
index 031df6ab3f..137688d023 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,6 +99,7 @@
 /third_party/google-visualization-python
 /third_party/icu
 /third_party/instrumented_libraries
+/third_party/ijar
 /third_party/jsoncpp
 /third_party/jsr-305
 /third_party/junit
@@ -132,6 +133,7 @@
 /third_party/syzygy
 /third_party/usrsctp
 /third_party/valgrind
+/third_party/WebKit
 /third_party/winsdk_samples/src
 /third_party/yasm
 /third_party/zlib
diff --git a/.gn b/.gn
index e15f3c5b8d..738ed031f9 100644
--- a/.gn
+++ b/.gn
@@ -42,5 +42,6 @@ exec_script_whitelist = [
   "//build/toolchain/win/BUILD.gn",
   "//third_party/boringssl/BUILD.gn",
   "//third_party/opus/BUILD.gn",
+  "//third_party/WebKit/Source/config.gni",
   "//webrtc/modules/video_render/BUILD.gn",
 ]
diff --git a/DEPS b/DEPS
index 6b72e3daf8..c862652a4e 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': 'a28d8d5a93d2d589bfac8fe77907cba3941b023e',
+  'chromium_revision': '5482f563e441be7ab1cf59a02e3fd9e010e9535b',
 }
 
 # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
diff --git a/chromium/.gclient b/chromium/.gclient
index 573a4558bf..7f46333e45 100644
--- a/chromium/.gclient
+++ b/chromium/.gclient
@@ -17,7 +17,6 @@ solutions = [{
     'src/third_party/skia': None,
     'src/third_party/trace-viewer': None,
     'src/third_party/webrtc': None,
-    'src/third_party/WebKit': None,
   },
   'safesync_url': ''
 }]
diff --git a/setup_links.py b/setup_links.py
index f6380f0137..bc46202c17 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -62,6 +62,7 @@ DIRECTORIES = [
   'third_party/sqlite',
   'third_party/syzygy',
   'third_party/usrsctp',
+  'third_party/WebKit',
   'third_party/yasm',
   'third_party/zlib',
   'tools/clang',
@@ -87,6 +88,7 @@ if 'android' in target_os:
     'third_party/android_tools',
     'third_party/appurify-python',
     'third_party/ashmem',
+    'third_party/ijar',
     'third_party/jsr-305',
     'third_party/junit',
     'third_party/libevent',
diff --git a/webrtc/base/sslstreamadapter_unittest.cc b/webrtc/base/sslstreamadapter_unittest.cc
index 67658ba610..18cc9bde11 100644
--- a/webrtc/base/sslstreamadapter_unittest.cc
+++ b/webrtc/base/sslstreamadapter_unittest.cc
@@ -799,20 +799,23 @@ TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSConnectWithSmallMtu) {
 };
 
 // Test transfer -- trivial
-TEST_P(SSLStreamAdapterTestDTLS, TestDTLSTransfer) {
+// Disabled due to https://code.google.com/p/webrtc/issues/detail?id=5005
+TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSTransfer) {
   MAYBE_SKIP_TEST(HaveDtls);
   TestHandshake();
   TestTransfer(100);
 };
 
-TEST_P(SSLStreamAdapterTestDTLS, TestDTLSTransferWithLoss) {
+// Disabled due to https://code.google.com/p/webrtc/issues/detail?id=5005
+TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSTransferWithLoss) {
   MAYBE_SKIP_TEST(HaveDtls);
   TestHandshake();
   SetLoss(10);
   TestTransfer(100);
 };
 
-TEST_P(SSLStreamAdapterTestDTLS, TestDTLSTransferWithDamage) {
+// Disabled due to https://code.google.com/p/webrtc/issues/detail?id=5005
+TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSTransferWithDamage) {
   MAYBE_SKIP_TEST(HaveDtls);
   SetDamage();  // Must be called first because first packet
                 // write happens at end of handshake.
diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py
index 2fec37c60c..eb70c4c97e 100755
--- a/webrtc/build/android/test_runner.py
+++ b/webrtc/build/android/test_runner.py
@@ -26,31 +26,12 @@ sys.path.insert(0, CHROMIUM_BUILD_ANDROID_DIR)
 
 
 import test_runner  # pylint: disable=W0406
-from pylib.gtest import gtest_config
-from pylib.gtest import setup
+from pylib.gtest import gtest_test_instance
 
 def main():
-  # Override the stable test suites with the WebRTC tests.
-  gtest_config.STABLE_TEST_SUITES = [
-    'audio_decoder_unittests',
-    'common_audio_unittests',
-    'common_video_unittests',
-    'modules_tests',
-    'modules_unittests',
-    'rtc_unittests',
-    'system_wrappers_unittests',
-    'test_support_unittests',
-    'tools_unittests',
-    'video_capture_tests',
-    'video_engine_tests',
-    'video_engine_core_unittests',
-    'voice_engine_unittests',
-    'webrtc_perf_tests',
-  ]
-  gtest_config.EXPERIMENTAL_TEST_SUITES = []
-
   # Set our own paths to the .isolate files.
-  setup.ISOLATE_FILE_PATHS = {
+  # pylint: disable=protected-access
+  gtest_test_instance._DEFAULT_ISOLATE_FILE_PATHS.update({
     'audio_decoder_unittests':
         'webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate',
     'common_audio_unittests':
@@ -72,7 +53,7 @@ def main():
     'voice_engine_unittests':
         'webrtc/voice_engine/voice_engine_unittests.isolate',
     'webrtc_perf_tests': 'webrtc/webrtc_perf_tests.isolate',
-  }
+  })
   # Override environment variable to make it possible for the scripts to find
   # the root directory (our symlinking of the Chromium build toolchain would
   # otherwise make them fail to do so).