| Index: webrtc/media/engine/webrtcvideoengine2.cc
 | 
| diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
 | 
| index 65833873f68c0e1a6f76edf67cba5fede33405d6..2465aab77801bace77d0fccaf04b492d153306b3 100644
 | 
| --- a/webrtc/media/engine/webrtcvideoengine2.cc
 | 
| +++ b/webrtc/media/engine/webrtcvideoengine2.cc
 | 
| @@ -144,10 +144,6 @@ 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.
 | 
| 
 |