Android: Replace webrtc_jni namespace with nested jni namespace

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

 /*
  *  Copyright 2015 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 21 matching lines @@
 // Helper that calls ptr->Release() and aborts the process with a useful
 // message if that didn't actually delete *ptr because of extra refcounts.
 #define CHECK_RELEASE(ptr) \
   RTC_CHECK_EQ(0, (ptr)->Release()) << "Unexpected refcount."
 
 // Convenience macro defining JNI-accessible methods in the org.webrtc package.
 // Eliminates unnecessary boilerplate and line-wraps, reducing visual clutter.
 #define JNI_FUNCTION_DECLARATION(rettype, name, ...) \
   extern "C" JNIEXPORT rettype JNICALL Java_org_webrtc_##name(__VA_ARGS__)
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
 jint InitGlobalJniVariables(JavaVM *jvm);
 
 // Return a |JNIEnv*| usable on this thread or NULL if this thread is detached.
 JNIEnv* GetEnv();
 
 JavaVM *GetJVM();
 
 // Return a |JNIEnv*| usable on this thread.  Attaches to |g_jvm| if necessary.
 JNIEnv* AttachCurrentThreadIfNeeded();
@@ skipping 144 matching lines @@
   Iterable::Iterator begin() { return Iterable::Iterator(jni_, iterable_); }
   Iterable::Iterator end() { return Iterable::Iterator(); }
 
  private:
   JNIEnv* jni_;
   jobject iterable_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Iterable);
 };
 
+}  // namespace jni
+}  // namespace webrtc
+
+// TODO(magjed): Remove once external clients are updated.
+namespace webrtc_jni {
+
+using webrtc::jni::AttachCurrentThreadIfNeeded;
+using webrtc::jni::InitGlobalJniVariables;
+
 }  // namespace webrtc_jni
 
 #endif  // WEBRTC_SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_