Index: webrtc/modules/audio_device/android/ensure_initialized.cc |
diff --git a/webrtc/modules/audio_device/android/ensure_initialized.cc b/webrtc/modules/audio_device/android/ensure_initialized.cc |
index e870fae395484d4ad62f154388a982744baf6273..e8197b7ca014bd77e3b82a9b29596b04b5053339 100644 |
--- a/webrtc/modules/audio_device/android/ensure_initialized.cc |
+++ b/webrtc/modules/audio_device/android/ensure_initialized.cc |
@@ -12,12 +12,10 @@ |
#include <pthread.h> |
-// Note: this dependency is dangerous since it reaches into Chromium's |
-// base. You can't include anything in this file that includes WebRTC's |
-// base/checks.h, for instance, since it will clash with Chromium's |
-// logging.h. Therefore, the CHECKs in this file will actually use |
-// Chromium's checks rather than the WebRTC ones. |
+// Note: this dependency is dangerous since it reaches into Chromium's base. |
+// There's a risk of e.g. macro clashes. This file may only be used in tests. |
#include "base/android/jni_android.h" |
+#include "webrtc/base/checks.h" |
#include "webrtc/modules/audio_device/android/audio_record_jni.h" |
#include "webrtc/modules/audio_device/android/audio_track_jni.h" |
#include "webrtc/modules/utility/interface/jvm_android.h" |
@@ -28,10 +26,10 @@ namespace audiodevicemodule { |
static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT; |
void EnsureInitializedOnce() { |
- CHECK(::base::android::IsVMInitialized()); |
+ RTC_CHECK(::base::android::IsVMInitialized()); |
JNIEnv* jni = ::base::android::AttachCurrentThread(); |
JavaVM* jvm = NULL; |
- CHECK_EQ(0, jni->GetJavaVM(&jvm)); |
+ RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); |
jobject context = ::base::android::GetApplicationContext(); |
// Initialize the Java environment (currently only used by the audio manager). |
@@ -39,7 +37,7 @@ void EnsureInitializedOnce() { |
} |
void EnsureInitialized() { |
- CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce)); |
+ RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce)); |
} |
} // namespace audiodevicemodule |