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

Side by Side Diff: webrtc/modules/video_coding/codecs/test/android_test_initializer.cc

Issue 3009613002: Android: Replace webrtc_jni namespace with nested jni namespace (Closed)
Patch Set: Rebase Created 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 22 matching lines...) Expand all
33 33
34 // There can only be one JNI_OnLoad in each binary. So since this is a GTEST 34 // There can only be one JNI_OnLoad in each binary. So since this is a GTEST
35 // C++ runner binary, we want to initialize the same global objects we normally 35 // C++ runner binary, we want to initialize the same global objects we normally
36 // do if this had been a Java binary. 36 // do if this had been a Java binary.
37 void EnsureInitializedOnce() { 37 void EnsureInitializedOnce() {
38 RTC_CHECK(::base::android::IsVMInitialized()); 38 RTC_CHECK(::base::android::IsVMInitialized());
39 JNIEnv* jni = ::base::android::AttachCurrentThread(); 39 JNIEnv* jni = ::base::android::AttachCurrentThread();
40 JavaVM* jvm = NULL; 40 JavaVM* jvm = NULL;
41 RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); 41 RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm));
42 42
43 jint ret = webrtc_jni::InitGlobalJniVariables(jvm); 43 jint ret = jni::InitGlobalJniVariables(jvm);
44 RTC_DCHECK_GE(ret, 0); 44 RTC_DCHECK_GE(ret, 0);
45 45
46 webrtc_jni::LoadGlobalClassReferenceHolder(); 46 jni::LoadGlobalClassReferenceHolder();
47 } 47 }
48 48
49 } // namespace 49 } // namespace
50 50
51 void InitializeAndroidObjects() { 51 void InitializeAndroidObjects() {
52 RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce)); 52 RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce));
53 } 53 }
54 54
55 } // namespace webrtc 55 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698