Android: Replace webrtc_jni namespace with nested jni namespace

webrtc/sdk/android/src/jni/androidvideotracksource.h

 /*
  *  Copyright (c) 2016 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.
  */
 
 #ifndef WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
 #define WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
 
 #include <jni.h>
 
 #include "webrtc/common_video/include/i420_buffer_pool.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/media/base/adaptedvideotracksource.h"
 #include "webrtc/rtc_base/asyncinvoker.h"
 #include "webrtc/rtc_base/checks.h"
 #include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/rtc_base/timestampaligner.h"
 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"
 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
 
 namespace webrtc {
+namespace jni {
 
 class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource {
  public:
   AndroidVideoTrackSource(rtc::Thread* signaling_thread,
                           JNIEnv* jni,
                           jobject j_surface_texture_helper,
                           bool is_screencast = false);
 
   bool is_screencast() const override { return is_screencast_; }
 
@@ skipping 15 matching lines @@
                                  int length,
                                  int width,
                                  int height,
                                  VideoRotation rotation,
                                  int64_t timestamp_ns);
 
   void OnTextureFrameCaptured(int width,
                               int height,
                               VideoRotation rotation,
                               int64_t timestamp_ns,
-                              const webrtc_jni::NativeHandleImpl& handle);
+                              const NativeHandleImpl& handle);
 
   void OnFrameCaptured(JNIEnv* jni,
                        int width,
                        int height,
                        int64_t timestamp_ns,
                        VideoRotation rotation,
                        jobject j_video_frame_buffer);
 
   void OnOutputFormatRequest(int width, int height, int fps);
 
-  rtc::scoped_refptr<webrtc_jni::SurfaceTextureHelper>
-  surface_texture_helper() {
+  rtc::scoped_refptr<SurfaceTextureHelper> surface_texture_helper() {
     return surface_texture_helper_;
   }
 
  private:
   rtc::Thread* signaling_thread_;
   rtc::AsyncInvoker invoker_;
   rtc::ThreadChecker camera_thread_checker_;
   SourceState state_;
   rtc::TimestampAligner timestamp_aligner_;
   NV12ToI420Scaler nv12toi420_scaler_;
   I420BufferPool buffer_pool_;
-  rtc::scoped_refptr<webrtc_jni::SurfaceTextureHelper> surface_texture_helper_;
-  webrtc_jni::AndroidVideoBufferFactory video_buffer_factory_;
+  rtc::scoped_refptr<SurfaceTextureHelper> surface_texture_helper_;
+  AndroidVideoBufferFactory video_buffer_factory_;
   const bool is_screencast_;
 
   jmethodID j_crop_and_scale_id_;
 };
 
+}  // namespace jni
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_