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

webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java

 /*
  *  Copyright 2013 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.
  */
 
 package org.webrtc;
 
-import android.content.Context;
 import java.util.List;
 
 /**
  * Java wrapper for a C++ PeerConnectionFactoryInterface.  Main entry point to
  * the PeerConnection API for clients.
  */
 public class PeerConnectionFactory {
   private static volatile boolean nativeLibLoaded;
 
   static {
     try {
       System.loadLibrary("jingle_peerconnection_so");
       nativeLibLoaded = true;
     } catch (UnsatisfiedLinkError t) {
       nativeLibLoaded = false;
     }
   }
 
   private static final String TAG = "PeerConnectionFactory";
   private final long nativeFactory;
-  private static Context applicationContext;
   private static Thread networkThread;
   private static Thread workerThread;
   private static Thread signalingThread;
   private EglBase localEglbase;
   private EglBase remoteEglbase;
 
   public static class Options {
     // Keep in sync with webrtc/base/network.h!
     static final int ADAPTER_TYPE_UNKNOWN = 0;
     static final int ADAPTER_TYPE_ETHERNET = 1 << 0;
     static final int ADAPTER_TYPE_WIFI = 1 << 1;
     static final int ADAPTER_TYPE_CELLULAR = 1 << 2;
     static final int ADAPTER_TYPE_VPN = 1 << 3;
     static final int ADAPTER_TYPE_LOOPBACK = 1 << 4;
 
     public int networkIgnoreMask;
     public boolean disableEncryption;
     public boolean disableNetworkMonitor;
   }
 
   // Must be called at least once before creating a PeerConnectionFactory
   // (for example, at application startup time).
-  public static native void nativeInitializeAndroidGlobals(
-      Context context, boolean videoHwAcceleration);
-
-  public static void initializeAndroidGlobals(Context context, boolean videoHwAcceleration) {
-    ContextUtils.initialize(context);
-    nativeInitializeAndroidGlobals(context, videoHwAcceleration);
-  }
+  public static native void initializeAndroidGlobals(
+      android.content.Context context, boolean videoHwAcceleration);
 
   // Older signature of initializeAndroidGlobals. The extra parameters are now meaningless.
   @Deprecated
   public static boolean initializeAndroidGlobals(Object context, boolean initializeAudio,
       boolean initializeVideo, boolean videoHwAcceleration) {
-    initializeAndroidGlobals((Context) context, videoHwAcceleration);
+    initializeAndroidGlobals((android.content.Context) context, videoHwAcceleration);
     return true;
   }
 
   // Field trial initialization. Must be called before PeerConnectionFactory
   // is created.
   public static native void initializeFieldTrials(String fieldTrialsInitString);
   // Wrapper of webrtc::field_trial::FindFullName. Develop the feature with default behaviour off.
   // Example usage:
   // if (PeerConnectionFactory.fieldTrialsFindFullName("WebRTCExperiment").equals("Enabled")) {
   //   method1();
@@ skipping 196 matching lines @@
 
   @Deprecated public native void nativeSetOptions(long nativeFactory, Options options);
 
   private static native void nativeSetVideoHwAccelerationOptions(
       long nativeFactory, Object localEGLContext, Object remoteEGLContext);
 
   private static native void nativeThreadsCallbacks(long nativeFactory);
 
   private static native void nativeFreeFactory(long nativeFactory);
 }