Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(582)

Unified Diff: webrtc/modules/audio_device/android/ensure_initialized.cc

Issue 1335923002: Add RTC_ prefix to (D)CHECKs and related macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « webrtc/modules/audio_device/android/build_info.h ('k') | webrtc/modules/audio_device/android/opensles_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698