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 |
deleted file mode 100644 |
index bc606bb88ed31d467363a6341df9841202ee4b8b..0000000000000000000000000000000000000000 |
--- a/webrtc/modules/video_capture/ensure_initialized.cc |
+++ /dev/null |
@@ -1,51 +0,0 @@ |
-/* |
- * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. |
- * |
- * Use of this source code is governed by a BSD-style license |
- * that can be found in the LICENSE file in the root of the source |
- * tree. An additional intellectual property rights grant can be found |
- * in the file PATENTS. All contributing project authors may |
- * be found in the AUTHORS file in the root of the source tree. |
- */ |
- |
-// Platform-specific initialization bits, if any, go here. |
- |
-#ifndef ANDROID |
- |
-namespace webrtc { |
-namespace videocapturemodule { |
-void EnsureInitialized() {} |
-} // namespace videocapturemodule |
-} // namespace webrtc |
- |
-#else |
- |
-#include <pthread.h> |
- |
-// 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/video_capture/video_capture_internal.h" |
- |
-namespace webrtc { |
-namespace videocapturemodule { |
- |
-static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT; |
- |
-void EnsureInitializedOnce() { |
- JNIEnv* jni = ::base::android::AttachCurrentThread(); |
- jobject context = ::base::android::GetApplicationContext(); |
- JavaVM* jvm = NULL; |
- RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); |
- RTC_CHECK_EQ(0, webrtc::SetCaptureAndroidVM(jvm, context)); |
-} |
- |
-void EnsureInitialized() { |
- RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce)); |
-} |
- |
-} // namespace videocapturemodule |
-} // namespace webrtc |
- |
-#endif // !ANDROID |