commit ef8b61e11062295365f11b9942f18a08a8b3ec60
author nisse <nisse@webrtc.org> Fri Apr 29 06:09:15 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Apr 29 13:09:23 2016 +0000
tree de14fb8f5d565be541d6536116c057d2561716e9
parent b296d0591cd71baacb4ecbd1a4698a6eb2b17bca

Enable -Winconsistent-missing-override flag.

The problem with gmock is worked around by commenting out any other override declarations in classes using gmock.

NOPRESUBMIT=True
BUG=webrtc:3970

Review-Url: https://codereview.webrtc.org/1921653002
Cr-Commit-Position: refs/heads/master@{#12563}

webrtc/api/java/jni/peerconnection_jni.cc

diff --git a/webrtc/api/java/jni/peerconnection_jni.cc b/webrtc/api/java/jni/peerconnection_jni.cc
index 34358ad..10b8134 100644
--- a/webrtc/api/java/jni/peerconnection_jni.cc
+++ b/webrtc/api/java/jni/peerconnection_jni.cc
@@ -202,7 +202,7 @@
   }
 
   void OnIceCandidatesRemoved(
-      const std::vector<cricket::Candidate>& candidates) {
+      const std::vector<cricket::Candidate>& candidates) override {
     ScopedLocalRefFrame local_ref_frame(jni());
     jobjectArray candidates_array = ToJavaCandidateArray(jni(), candidates);
     jmethodID m =