Android: Replace webrtc_jni namespace with nested jni namespace

webrtc/sdk/android/src/jni/pc/sdpobserver_jni.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_
 #define WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_
 
 #include <memory>
 #include <string>
 
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h"
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
 // Adapter for a Java StatsObserver presenting a C++
 // CreateSessionDescriptionObserver or SetSessionDescriptionObserver and
 // dispatching the callback from C++ back to Java.
 template <class T>  // T is one of {Create,Set}SessionDescriptionObserver.
 class SdpObserverJni : public T {
  public:
   SdpObserverJni(JNIEnv* jni,
                  jobject j_observer,
                  MediaConstraintsJni* constraints)
       : constraints_(constraints),
         j_observer_global_(jni, j_observer),
         j_observer_class_(jni, GetObjectClass(jni, j_observer)) {}
 
   virtual ~SdpObserverJni() {}
 
   // Can't mark override because of templating.
   virtual void OnSuccess() {
     ScopedLocalRefFrame local_ref_frame(jni());
     jmethodID m = GetMethodID(jni(), *j_observer_class_, "onSetSuccess", "()V");
     jni()->CallVoidMethod(*j_observer_global_, m);
     CHECK_EXCEPTION(jni()) << "error during CallVoidMethod";
   }
 
   // Can't mark override because of templating.
-  virtual void OnSuccess(webrtc::SessionDescriptionInterface* desc) {
+  virtual void OnSuccess(SessionDescriptionInterface* desc) {
     ScopedLocalRefFrame local_ref_frame(jni());
     jmethodID m = GetMethodID(jni(), *j_observer_class_, "onCreateSuccess",
                               "(Lorg/webrtc/SessionDescription;)V");
     jobject j_sdp = NativeToJavaSessionDescription(jni(), desc);
     jni()->CallVoidMethod(*j_observer_global_, m, j_sdp);
     CHECK_EXCEPTION(jni()) << "error during CallVoidMethod";
     // OnSuccess transfers ownership of the description (there's a TODO to make
     // it use unique_ptr...).
     delete desc;
   }
@@ skipping 11 matching lines @@
 
   JNIEnv* jni() { return AttachCurrentThreadIfNeeded(); }
 
  private:
   std::unique_ptr<MediaConstraintsJni> constraints_;
   const ScopedGlobalRef<jobject> j_observer_global_;
   const ScopedGlobalRef<jclass> j_observer_class_;
 };
 
 class CreateSdpObserverJni
-    : public SdpObserverJni<webrtc::CreateSessionDescriptionObserver> {
+    : public SdpObserverJni<CreateSessionDescriptionObserver> {
  public:
   CreateSdpObserverJni(JNIEnv* jni,
                        jobject j_observer,
                        MediaConstraintsJni* constraints)
       : SdpObserverJni(jni, j_observer, constraints) {}
 
   void OnFailure(const std::string& error) override {
     ScopedLocalRefFrame local_ref_frame(jni());
     SdpObserverJni::DoOnFailure(std::string("Create"), error);
   }
 };
 
-class SetSdpObserverJni
-    : public SdpObserverJni<webrtc::SetSessionDescriptionObserver> {
+class SetSdpObserverJni : public SdpObserverJni<SetSessionDescriptionObserver> {
  public:
   SetSdpObserverJni(JNIEnv* jni,
                     jobject j_observer,
                     MediaConstraintsJni* constraints)
       : SdpObserverJni(jni, j_observer, constraints) {}
 
   void OnFailure(const std::string& error) override {
     ScopedLocalRefFrame local_ref_frame(jni());
     SdpObserverJni::DoOnFailure(std::string("Set"), error);
   }
 };
 
-}  // namespace webrtc_jni
+}  // namespace jni
+}  // namespace webrtc
 
 #endif  // WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_