diff --git a/.gitignore b/.gitignore
index e173e64177..4a6d211e0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,6 +100,7 @@
 /third_party/jsoncpp
 /third_party/jsr-305
 /third_party/junit
+/third_party/junit-jar
 /third_party/libc++
 /third_party/libc++abi
 /third_party/libevent
@@ -113,6 +114,7 @@
 /third_party/libyuv
 /third_party/llvm
 /third_party/llvm-build
+/third_party/mockito
 /third_party/modp_b64
 /third_party/nss
 /third_party/oauth2
@@ -121,6 +123,7 @@
 /third_party/opus
 /third_party/protobuf
 /third_party/requests
+/third_party/robolectric
 /third_party/sqlite
 /third_party/syzygy
 /third_party/usrsctp
diff --git a/DEPS b/DEPS
index 4c50f63dfc..22c78e8777 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': 'a12e1e10c4a910a4f8aa20e3ea8b611846f19ed9',
+  'chromium_revision': '0cb254911980cce90b2e5c7207a37a27420e9ea7',
 }
 
 # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
@@ -17,7 +17,7 @@ deps = {
   'src/third_party/gflags/src':
     Var('chromium_git') + '/external/gflags/src@e7390f9185c75f8d902c05ed7d20bb94eb914d0c', # from svn revision 82
 
-  'src/third_party/junit':
+  'src/third_party/junit-jar':
     Var('chromium_git') + '/external/webrtc/deps/third_party/junit@f35596b476aa6e62fd3b3857b9942ddcd13ce35e', # from svn revision 3367
 }
 
diff --git a/chromium/.gclient b/chromium/.gclient
index af8552ac72..573a4558bf 100644
--- a/chromium/.gclient
+++ b/chromium/.gclient
@@ -12,7 +12,6 @@ solutions = [{
     'src/third_party/cld_2/src': None,
     'src/third_party/ffmpeg': None,
     'src/third_party/hunspell_dictionaries': None,
-    'src/third_party/junit/src': None,
     'src/third_party/liblouis/src': None,
     'src/third_party/pdfium': None,
     'src/third_party/skia': None,
diff --git a/setup_links.py b/setup_links.py
index ed8b923db1..64366c1805 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -83,10 +83,13 @@ if 'android' in get_target_os_list():
     'third_party/appurify-python',
     'third_party/ashmem',
     'third_party/jsr-305',
+    'third_party/junit',
     'third_party/libevent',
     'third_party/libxml',
+    'third_party/mockito',
     'third_party/modp_b64',
     'third_party/requests',
+    'third_party/robolectric',
     'tools/android',
     'tools/grit',
     'tools/relocation_packer'
diff --git a/sync_chromium.py b/sync_chromium.py
index 08b10427d8..3f366522e0 100755
--- a/sync_chromium.py
+++ b/sync_chromium.py
@@ -30,7 +30,7 @@ import textwrap
 
 # Bump this whenever the algorithm changes and you need bots/devs to re-sync,
 # ignoring the .last_sync_chromium file
-SCRIPT_VERSION = 4
+SCRIPT_VERSION = 5
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 CHROMIUM_NO_HISTORY = 'CHROMIUM_NO_HISTORY'
diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp
index 718397296a..246fa3b134 100755
--- a/talk/libjingle_tests.gyp
+++ b/talk/libjingle_tests.gyp
@@ -250,10 +250,16 @@
   ],
   'conditions': [
     ['OS=="linux"', {
+      'variables': {
+        'junit_jar': '<(DEPTH)/third_party/junit-jar/junit-4.11.jar',
+      },
       'targets': [
         {
           'target_name': 'libjingle_peerconnection_test_jar',
           'type': 'none',
+          'dependencies': [
+            'libjingle.gyp:libjingle_peerconnection_jar',
+          ],
           'actions': [
             {
               'variables': {
@@ -269,7 +275,7 @@
                 '<@(java_files)',
                 '<(PRODUCT_DIR)/libjingle_peerconnection.jar',
                 '<(PRODUCT_DIR)/lib/libjingle_peerconnection_so.so',
-                '<(DEPTH)/third_party/junit/junit-4.11.jar',
+                '<(junit_jar)',
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/libjingle_peerconnection_test.jar',
@@ -277,7 +283,7 @@
               'action': [
                 'build/build_jar.sh', '<(java_home)', '<@(_outputs)',
                 '<(INTERMEDIATE_DIR)',
-                '<(java_src_dir):<(PRODUCT_DIR)/libjingle_peerconnection.jar:<(DEPTH)/third_party/junit/junit-4.11.jar',
+                '<(java_src_dir):<(PRODUCT_DIR)/libjingle_peerconnection.jar:<(junit_jar)',
                 '<@(java_files)'
               ],
             },
@@ -292,7 +298,7 @@
               'inputs': [
                 'app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh',
                 '<(PRODUCT_DIR)/libjingle_peerconnection_test_jar',
-                '<(DEPTH)/third_party/junit/junit-4.11.jar',
+                '<(junit_jar)',
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/libjingle_peerconnection_java_unittest',
@@ -303,7 +309,7 @@
                 'sed -e "s@GYP_JAVA_HOME@<(java_home)@" '
                 '< app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh '
                 '> <(PRODUCT_DIR)/libjingle_peerconnection_java_unittest && '
-                'cp <(DEPTH)/third_party/junit/junit-4.11.jar <(PRODUCT_DIR) && '
+                'cp <(junit_jar) <(PRODUCT_DIR) && '
                 'chmod u+x <(PRODUCT_DIR)/libjingle_peerconnection_java_unittest'
               ],
             },