commit e1c5ec72c6a55b12a00ed3de1504c663367c058d
author Patrik Höglund <phoglund@webrtc.org> Thu Sep 17 17:20:38 2015 +0200
committer Patrik Höglund <phoglund@webrtc.org> Thu Sep 17 15:20:43 2015 +0000
tree 06512a95a2647a05100e0861e626421e5bbf6f98
parent fdd1b9a58e4ffbd1442f7d5b1a0bc9c602a8ed5f

Fixing bad merge (CHECK is now RTC_CHECK)

BUG=None
TBR=glaznev@webrtc.org

Review URL: https://codereview.webrtc.org/1346013006 .

Cr-Commit-Position: refs/heads/master@{#9975}

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 f7d33b1..8e274a4 100644
--- a/talk/app/webrtc/java/jni/peerconnection_jni.cc
+++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc
@@ -1103,8 +1103,8 @@
                                           NULL,
                                           encoder_factory,
                                           decoder_factory));
-  CHECK(factory) << "Failed to create the peer connection factory; "
-                 << "WebRTC/libjingle init likely failed on this device";
+  RTC_CHECK(factory) << "Failed to create the peer connection factory; "
+                     << "WebRTC/libjingle init likely failed on this device";
   OwnedFactoryAndThreads* owned_factory = new OwnedFactoryAndThreads(
       worker_thread, signaling_thread,
       encoder_factory, decoder_factory,