| Index: talk/app/webrtc/java/jni/jni_helpers.h
 | 
| diff --git a/talk/app/webrtc/java/jni/jni_helpers.h b/talk/app/webrtc/java/jni/jni_helpers.h
 | 
| index dde713728bdf665753e6e360de6f221e12c57635..7072ee855e95438ce1fdde3b983c3be1396dbac0 100644
 | 
| --- a/talk/app/webrtc/java/jni/jni_helpers.h
 | 
| +++ b/talk/app/webrtc/java/jni/jni_helpers.h
 | 
| @@ -41,14 +41,14 @@
 | 
|  // This macros uses the comma operator to execute ExceptionDescribe
 | 
|  // and ExceptionClear ignoring their return values and sending ""
 | 
|  // to the error stream.
 | 
| -#define CHECK_EXCEPTION(jni)    \
 | 
| -  CHECK(!jni->ExceptionCheck()) \
 | 
| +#define CHECK_EXCEPTION(jni)        \
 | 
| +  RTC_CHECK(!jni->ExceptionCheck()) \
 | 
|        << (jni->ExceptionDescribe(), jni->ExceptionClear(), "")
 | 
|  
 | 
|  // Helper that calls ptr->Release() and aborts the process with a useful
 | 
|  // message if that didn't actually delete *ptr because of extra refcounts.
 | 
|  #define CHECK_RELEASE(ptr) \
 | 
| -  CHECK_EQ(0, (ptr)->Release()) << "Unexpected refcount."
 | 
| +  RTC_CHECK_EQ(0, (ptr)->Release()) << "Unexpected refcount."
 | 
|  
 | 
|  namespace webrtc_jni {
 | 
|  
 | 
| @@ -67,8 +67,8 @@ JNIEnv* AttachCurrentThreadIfNeeded();
 | 
|  // function expecting a 64-bit param) picks up garbage in the high 32 bits.
 | 
|  jlong jlongFromPointer(void* ptr);
 | 
|  
 | 
| -// JNIEnv-helper methods that CHECK success: no Java exception thrown and found
 | 
| -// object/class/method/field is non-null.
 | 
| +// JNIEnv-helper methods that RTC_CHECK success: no Java exception thrown and
 | 
| +// found object/class/method/field is non-null.
 | 
|  jmethodID GetMethodID(
 | 
|      JNIEnv* jni, jclass c, const std::string& name, const char* signature);
 | 
|  
 | 
| 
 |