Android: Replace webrtc_jni namespace with nested jni namespace

webrtc/examples/unityplugin/simple_peer_connection.cc

 /*
  *  Copyright (c) 2017 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.
  */
 
@@ skipping 146 matching lines @@
       config_, &constraints, nullptr, nullptr, this);
 
   return peer_connection_.get() != nullptr;
 }
 
 void SimplePeerConnection::DeletePeerConnection() {
   g_peer_count--;
 
 #if defined(WEBRTC_ANDROID)
   if (g_camera) {
-    JNIEnv* env = webrtc_jni::GetEnv();
+    JNIEnv* env = webrtc::jni::GetEnv();
     jclass pc_factory_class =
         unity_plugin::FindClass(env, "org/webrtc/UnityUtility");
-    jmethodID stop_camera_method = webrtc_jni::GetStaticMethodID(
+    jmethodID stop_camera_method = webrtc::jni::GetStaticMethodID(
         env, pc_factory_class, "StopCamera", "(Lorg/webrtc/VideoCapturer;)V");
 
     env->CallStaticVoidMethod(pc_factory_class, stop_camera_method, g_camera);
     CHECK_EXCEPTION(env);
 
     g_camera = nullptr;
   }
 #endif
 
   CloseDataChannel();
@@ skipping 221 matching lines @@
       g_peer_connection_factory->CreateLocalMediaStream(kStreamLabel);
 
   rtc::scoped_refptr<webrtc::AudioTrackInterface> audio_track(
       g_peer_connection_factory->CreateAudioTrack(
           kAudioLabel, g_peer_connection_factory->CreateAudioSource(nullptr)));
   std::string id = audio_track->id();
   stream->AddTrack(audio_track);
 
   if (!audio_only) {
 #if defined(WEBRTC_ANDROID)
-    JNIEnv* env = webrtc_jni::GetEnv();
+    JNIEnv* env = webrtc::jni::GetEnv();
     jclass pc_factory_class =
         unity_plugin::FindClass(env, "org/webrtc/UnityUtility");
-    jmethodID load_texture_helper_method = webrtc_jni::GetStaticMethodID(
+    jmethodID load_texture_helper_method = webrtc::jni::GetStaticMethodID(
         env, pc_factory_class, "LoadSurfaceTextureHelper",
         "()Lorg/webrtc/SurfaceTextureHelper;");
     jobject texture_helper = env->CallStaticObjectMethod(
         pc_factory_class, load_texture_helper_method);
     CHECK_EXCEPTION(env);
     RTC_DCHECK(texture_helper != nullptr)
         << "Cannot get the Surface Texture Helper.";
 
-    rtc::scoped_refptr<webrtc::AndroidVideoTrackSource> source(
-        new rtc::RefCountedObject<webrtc::AndroidVideoTrackSource>(
+    rtc::scoped_refptr<AndroidVideoTrackSource> source(
+        new rtc::RefCountedObject<AndroidVideoTrackSource>(
             g_signaling_thread.get(), env, texture_helper, false));
     rtc::scoped_refptr<webrtc::VideoTrackSourceProxy> proxy_source =
         webrtc::VideoTrackSourceProxy::Create(g_signaling_thread.get(),
                                               g_worker_thread.get(), source);
 
     // link with VideoCapturer (Camera);
-    jmethodID link_camera_method = webrtc_jni::GetStaticMethodID(
+    jmethodID link_camera_method = webrtc::jni::GetStaticMethodID(
         env, pc_factory_class, "LinkCamera",
         "(JLorg/webrtc/SurfaceTextureHelper;)Lorg/webrtc/VideoCapturer;");
     jobject camera_tmp =
         env->CallStaticObjectMethod(pc_factory_class, link_camera_method,
                                     (jlong)proxy_source.get(), texture_helper);
     CHECK_EXCEPTION(env);
     g_camera = (jobject)env->NewGlobalRef(camera_tmp);
 
     rtc::scoped_refptr<webrtc::VideoTrackInterface> video_track(
         g_peer_connection_factory->CreateVideoTrack(kVideoLabel,
@@ skipping 113 matching lines @@
 
     for (const auto& param : params) {
       uint32_t ssrc = param.ssrc.value_or(0);
       if (ssrc > 0)
         ssrcs.push_back(ssrc);
     }
   }
 
   return ssrcs;
 }