Revert of https://codereview.webrtc.org/2889183002/

webrtc/modules/utility/include/jvm_android.h

 /*
  *  Copyright (c) 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 100 matching lines @@
 };
 
 // Main class for working with Java from C++ using JNI in WebRTC.
 //
 // Example usage:
 //
 //   // At initialization (e.g. in JNI_OnLoad), call JVM::Initialize.
 //   JNIEnv* jni = ::base::android::AttachCurrentThread();
 //   JavaVM* jvm = NULL;
 //   jni->GetJavaVM(&jvm);
-//   webrtc::JVM::Initialize(jvm);
+//   jobject context = ::base::android::GetApplicationContext();
+//   webrtc::JVM::Initialize(jvm, context);
 //
 //   // Header (.h) file of example class called User.
 //   std::unique_ptr<JNIEnvironment> env;
 //   std::unique_ptr<NativeRegistration> reg;
 //   std::unique_ptr<GlobalRef> obj;
 //
 //   // Construction (in .cc file) of User class.
 //   User::User() {
 //     // Calling thread must be attached to the JVM.
 //     env = JVM::GetInstance()->environment();
 //     reg = env->RegisterNatives("org/webrtc/WebRtcTest", ,);
 //     obj = reg->NewObject("<init>", ,);
 //   }
 //
 //   // Each User method can now use |reg| and |obj| and call Java functions
 //   // in WebRtcTest.java, e.g. boolean init() {}.
 //   bool User::Foo() {
 //     jmethodID id = reg->GetMethodId("init", "()Z");
 //     return obj->CallBooleanMethod(id);
 //   }
 //
 //   // And finally, e.g. in JNI_OnUnLoad, call JVM::Uninitialize.
 //   JVM::Uninitialize();
 class JVM {
  public:
-  // Stores global handles to the Java VM interface.
+  // Stores global handles to the Java VM interface and the application context.
   // Should be called once on a thread that is attached to the JVM.
-  static void Initialize(JavaVM* jvm);
-  // TODO(sakal): Remove once downstream dependencies have been updated.
-  // Deprecated old signature with Android context.
-  static void Initialize(JavaVM* jvm, jobject context) { Initialize(jvm); }
+  static void Initialize(JavaVM* jvm, jobject context);
   // Clears handles stored in Initialize(). Must be called on same thread as
   // Initialize().
   static void Uninitialize();
   // Gives access to the global Java VM interface pointer, which then can be
   // used to create a valid JNIEnvironment object or to get a JavaClass object.
   static JVM* GetInstance();
 
   // Creates a JNIEnvironment object.
   // This method returns a NULL pointer if AttachCurrentThread() has not been
   // called successfully. Use the AttachCurrentThreadIfNeeded class if needed.
   std::unique_ptr<JNIEnvironment> environment();
 
   // Returns a JavaClass object given class |name|.
   // Note that the class name must be one of the names in the static
   // |loaded_classes| array defined in jvm_android.cc.
   // This method must be called on the construction thread.
   JavaClass GetClass(const char* name);
 
   // TODO(henrika): can we make these private?
   JavaVM* jvm() const { return jvm_; }
+  jobject context() const { return context_; }
 
  protected:
-  JVM(JavaVM* jvm);
+  JVM(JavaVM* jvm, jobject context);
   ~JVM();
 
  private:
   JNIEnv* jni() const { return GetEnv(jvm_); }
 
   rtc::ThreadChecker thread_checker_;
   JavaVM* const jvm_;
+  jobject context_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_