| Index: talk/app/webrtc/java/jni/peerconnection_jni.cc
|
| diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc
|
| index c31859def809318b3bf61e400504dc112bce1478..dea2a91a1ddc9db0087e55cc2fe8a0eb7296f38e 100644
|
| --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc
|
| +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc
|
| @@ -547,7 +547,7 @@ class SdpObserverWrapper : public T {
|
| protected:
|
| // Common implementation for failure of Set & Create types, distinguished by
|
| // |op| being "Set" or "Create".
|
| - void OnFailure(const std::string& op, const std::string& error) {
|
| + void DoOnFailure(const std::string& op, const std::string& error) {
|
| jmethodID m = GetMethodID(jni(), *j_observer_class_, "on" + op + "Failure",
|
| "(Ljava/lang/String;)V");
|
| jstring j_error_string = JavaStringFromStdString(jni(), error);
|
| @@ -574,7 +574,7 @@ class CreateSdpObserverWrapper
|
|
|
| void OnFailure(const std::string& error) override {
|
| ScopedLocalRefFrame local_ref_frame(jni());
|
| - SdpObserverWrapper::OnFailure(std::string("Create"), error);
|
| + SdpObserverWrapper::DoOnFailure(std::string("Create"), error);
|
| }
|
| };
|
|
|
| @@ -587,7 +587,7 @@ class SetSdpObserverWrapper
|
|
|
| void OnFailure(const std::string& error) override {
|
| ScopedLocalRefFrame local_ref_frame(jni());
|
| - SdpObserverWrapper::OnFailure(std::string("Set"), error);
|
| + SdpObserverWrapper::DoOnFailure(std::string("Set"), error);
|
| }
|
| };
|
|
|
|
|