diff --git a/.gitignore b/.gitignore
index 35c7c7e60c..224ff6ea96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@
 /gyp-mac-tool
 /links
 /links.db
+/mojo
 /out
 /resources/**/*.aecdump
 /resources/**/*.bin
@@ -103,7 +104,7 @@
 /third_party/libjpeg
 /third_party/libjpeg_turbo
 /third_party/libsrtp
-/third_party/libvpx_new
+/third_party/libvpx
 /third_party/libxml
 /third_party/libudev
 /third_party/libyuv
diff --git a/DEPS b/DEPS
index c59901e279..ac7e987b7e 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': 'ee311243eae6aef9c907543663754ff38f1f4f40',
+  'chromium_revision': '508edd3841b53f2f6063c6a6ef58f34a4e41e71c',
 }
 
 # NOTE: Use http rather than https; the latter can cause problems for users
diff --git a/setup_links.py b/setup_links.py
index f7fa9ff073..1bc10d870a 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -34,6 +34,7 @@ import textwrap
 DIRECTORIES = [
   'build',
   'buildtools',
+  'mojo',  # TODO(kjellander): Remove, see webrtc:5629.
   'testing',
   'third_party/binutils',
   'third_party/boringssl',
@@ -48,7 +49,7 @@ DIRECTORIES = [
   'third_party/libjpeg_turbo',
   'third_party/libsrtp',
   'third_party/libudev',
-  'third_party/libvpx_new',
+  'third_party/libvpx',
   'third_party/libyuv',
   'third_party/llvm-build',
   'third_party/lss',
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index ed9b62a754..cafd612de2 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -112,7 +112,7 @@
     'have_dbus_glib%': 0,
 
     # Make it possible to provide custom locations for some libraries.
-    'libvpx_dir%': '<(DEPTH)/third_party/libvpx_new',
+    'libvpx_dir%': '<(DEPTH)/third_party/libvpx',
     'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
     'opus_dir%': '<(opus_dir)',
 
diff --git a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc
index 716378ee6b..8e5a22b81c 100644
--- a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc
+++ b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc
@@ -26,7 +26,7 @@ char kTSanDefaultSuppressions[] =
 // Split up suppressions covered previously by thread.cc and messagequeue.cc.
 "race:rtc::MessageQueue::Quit\n"
 "race:vp8cx_remove_encoder_threads\n"
-"race:third_party/libvpx_new/source/libvpx/vp9/common/vp9_scan.h\n"
+"race:third_party/libvpx/source/libvpx/vp9/common/vp9_scan.h\n"
 
 // Usage of trace callback and trace level is racy in rtc_media_unittests.
 // https://code.google.com/p/webrtc/issues/detail?id=3372
diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni
index 276156fa3a..2b3c209869 100644
--- a/webrtc/build/webrtc.gni
+++ b/webrtc/build/webrtc.gni
@@ -120,6 +120,6 @@ declare_args() {
 
 # Make it possible to provide custom locations for some libraries (move these
 # up into declare_args should we need to actually use them for the GN build).
-rtc_libvpx_dir = "//third_party/libvpx_new"
+rtc_libvpx_dir = "//third_party/libvpx"
 rtc_libyuv_dir = "//third_party/libyuv"
 rtc_opus_dir = "//third_party/opus"
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index ccb5a6de5d..1b93c1f534 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -446,7 +446,7 @@
             }],
             ['build_libvpx==1', {
               'dependencies': [
-                '<(libvpx_dir)/libvpx.gyp:libvpx_new',
+                '<(libvpx_dir)/libvpx.gyp:libvpx',
               ],
             }],
             ['OS=="android"', {
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
index fed6e74a17..71abbd54e6 100644
--- a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
+++ b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
@@ -23,7 +23,7 @@
       'conditions': [
         ['build_libvpx==1', {
           'dependencies': [
-            '<(libvpx_dir)/libvpx.gyp:libvpx_new',
+            '<(libvpx_dir)/libvpx.gyp:libvpx',
           ],
         }],
       ],
diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9.gyp b/webrtc/modules/video_coding/codecs/vp9/vp9.gyp
index 8993d79bd7..cd5201f8aa 100644
--- a/webrtc/modules/video_coding/codecs/vp9/vp9.gyp
+++ b/webrtc/modules/video_coding/codecs/vp9/vp9.gyp
@@ -17,7 +17,7 @@
       'conditions': [
         ['build_libvpx==1', {
           'dependencies': [
-            '<(libvpx_dir)/libvpx.gyp:libvpx_new',
+            '<(libvpx_dir)/libvpx.gyp:libvpx',
           ],
         }],
       ],