Roll chromium_revision f8d6ba9..a28d8d5 (337800:346100)

webrtc/modules/audio_device/android/ensure_initialized.cc

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 a194a5e9c9aad4dce478927ec76ae6c98c0c69fc..e870fae395484d4ad62f154388a982744baf6273 100644
--- a/webrtc/modules/audio_device/android/ensure_initialized.cc
+++ b/webrtc/modules/audio_device/android/ensure_initialized.cc
@@ -12,9 +12,12 @@
 
 #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.
 #include "base/android/jni_android.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/modules/audio_device/android/audio_device_template.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"