| Index: webrtc/media/engine/webrtcvideoengine2.cc
 | 
| diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
 | 
| index d3e71a381f795ec286202c0bd6c034a9d3a72155..e37bf94a651cc517676c484861ee063ebc1b1aca 100644
 | 
| --- a/webrtc/media/engine/webrtcvideoengine2.cc
 | 
| +++ b/webrtc/media/engine/webrtcvideoengine2.cc
 | 
| @@ -149,6 +149,10 @@ class WebRtcSimulcastEncoderFactory
 | 
|    }
 | 
|  
 | 
|   private:
 | 
| +  // Disable overloaded virtual function warning. TODO(magjed): Remove once
 | 
| +  // http://crbug/webrtc/6402 is fixed.
 | 
| +  using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder;
 | 
| +
 | 
|    cricket::WebRtcVideoEncoderFactory* factory_;
 | 
|    // A list of encoders that were created without being wrapped in a
 | 
|    // SimulcastEncoderAdapter.
 | 
| 
 |