diff --git a/webrtc/media/engine/webrtcvideoframefactory.h b/webrtc/media/engine/webrtcvideoframefactory.h
index c1569969fb..39d813ff75 100644
--- a/webrtc/media/engine/webrtcvideoframefactory.h
+++ b/webrtc/media/engine/webrtcvideoframefactory.h
@@ -20,6 +20,11 @@ struct CapturedFrame;
 // Creates instances of cricket::WebRtcVideoFrame.
 class WebRtcVideoFrameFactory : public VideoFrameFactory {
  public:
+  // Note: Overriding a method name overrides all overloaded versions.
+  // Without this using-declaration, we would hide the 5-argument
+  // method we want to inherit.
+  using VideoFrameFactory::CreateAliasedFrame;
+
   VideoFrame* CreateAliasedFrame(const CapturedFrame* aliased_frame,
                                  int width,
                                  int height) const override;
diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp
index 9f0a9649e1..f40421d68f 100644
--- a/webrtc/media/media.gyp
+++ b/webrtc/media/media.gyp
@@ -254,6 +254,7 @@
             '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
             '<(webrtc_root)/test/test.gyp:test_support',
+            'rtc_media',
             'rtc_unittest_main',
           ],
           'sources': [