Roll chromium_revision f8d6ba9..a28d8d5 (337800:346100)

webrtc/modules/video_capture/ensure_initialized.cc

Index: webrtc/modules/video_capture/ensure_initialized.cc
diff --git a/webrtc/modules/video_capture/ensure_initialized.cc b/webrtc/modules/video_capture/ensure_initialized.cc
index 9d43d9f1bdf6c42ccc8191cf2b6b2c3e9cc0b9cc..68cac047f18ae51291f02f72acd543b9fd003da4 100644
--- a/webrtc/modules/video_capture/ensure_initialized.cc
+++ b/webrtc/modules/video_capture/ensure_initialized.cc
@@ -22,8 +22,12 @@ void EnsureInitialized() {}
 
 #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/video_capture/video_capture_internal.h"
 
 namespace webrtc {