Android: Replace webrtc_jni namespace with nested jni namespace

webrtc/sdk/android/src/jni/pc/datachannel_jni.cc

 /*
  *  Copyright 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.
  */
 
 #include <memory>
 
 #include "webrtc/api/datachannelinterface.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/sdk/android/src/jni/pc/datachannelobserver_jni.h"
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
-static webrtc::DataChannelInterface* ExtractNativeDC(JNIEnv* jni,
-                                                     jobject j_dc) {
+static DataChannelInterface* ExtractNativeDC(JNIEnv* jni, jobject j_dc) {
   jfieldID native_dc_id =
       GetFieldID(jni, GetObjectClass(jni, j_dc), "nativeDataChannel", "J");
   jlong j_d = GetLongField(jni, j_dc, native_dc_id);
-  return reinterpret_cast<webrtc::DataChannelInterface*>(j_d);
+  return reinterpret_cast<DataChannelInterface*>(j_d);
 }
 
 JNI_FUNCTION_DECLARATION(jlong,
                          DataChannel_registerObserverNative,
                          JNIEnv* jni,
                          jobject j_dc,
                          jobject j_observer) {
   std::unique_ptr<DataChannelObserverJni> observer(
       new DataChannelObserverJni(jni, j_observer));
   ExtractNativeDC(jni, j_dc)->RegisterObserver(observer.get());
@@ skipping 45 matching lines @@
   ExtractNativeDC(jni, j_dc)->Close();
 }
 
 JNI_FUNCTION_DECLARATION(jboolean,
                          DataChannel_sendNative,
                          JNIEnv* jni,
                          jobject j_dc,
                          jbyteArray data,
                          jboolean binary) {
   jbyte* bytes = jni->GetByteArrayElements(data, NULL);
-  bool ret = ExtractNativeDC(jni, j_dc)->Send(webrtc::DataBuffer(
+  bool ret = ExtractNativeDC(jni, j_dc)->Send(DataBuffer(
       rtc::CopyOnWriteBuffer(bytes, jni->GetArrayLength(data)), binary));
   jni->ReleaseByteArrayElements(data, bytes, JNI_ABORT);
   return ret;
 }
 
 JNI_FUNCTION_DECLARATION(void, DataChannel_dispose, JNIEnv* jni, jobject j_dc) {
   CHECK_RELEASE(ExtractNativeDC(jni, j_dc));
 }
 
-}  // namespace webrtc_jni
+}  // namespace jni
+}  // namespace webrtc