| Index: webrtc/sdk/android/src/jni/androidmediaencoder_jni.h
 | 
| diff --git a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.h b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.h
 | 
| index 3e6d88493b9152ba9fa0a3886007a9babb846b63..08f5502c860408d3ded948d6de95d00fbd5ced27 100644
 | 
| --- a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.h
 | 
| +++ b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.h
 | 
| @@ -34,10 +34,6 @@ class MediaCodecVideoEncoderFactory
 | 
|    void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
 | 
|  
 | 
|   private:
 | 
| -  // Disable overloaded virtual function warning. TODO(magjed): Remove once
 | 
| -  // http://crbug/webrtc/6402 is fixed.
 | 
| -  using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder;
 | 
| -
 | 
|    jobject egl_context_;
 | 
|  
 | 
|    // Empty if platform support is lacking, const after ctor returns.
 | 
| 
 |