Revert of Add API for custom library loading

components/cronet/android/api/src/org/chromium/net/CronetEngine.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import android.content.Context;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.util.Log;
@@ skipping 23 matching lines @@
  * An engine to process {@link UrlRequest}s, which uses the best HTTP stack
  * available on the current platform.
  */
 public abstract class CronetEngine {
     /**
      * A builder for {@link CronetEngine}s, which allows runtime configuration of
      * {@code CronetEngine}. Configuration options are set on the builder and
      * then {@link #build} is called to create the {@code CronetEngine}.
      */
     public static class Builder {
-        /**
-         * A class which provides a method for loading the cronet native library. Apps needing to
-         * implement custom library loading logic can inherit from this class and pass an instance
-         * to {@link CronetEngine.Builder#setLibraryLoader}. For example, this might be required
-         * to work around {@code UnsatisfiedLinkError}s caused by flaky installation on certain
-         * older devices.
-         */
-        public abstract static class LibraryLoader {
-            /**
-             * Loads the native library.
-             * @param libName name of the library to load
-             */
-            public abstract void loadLibrary(String libName);
-        }
-
         // A hint that a host supports QUIC.
         static class QuicHint {
             // The host.
             final String mHost;
             // Port of the server that supports QUIC.
             final int mPort;
             // Alternate protocol port.
             final int mAlternatePort;
 
             QuicHint(String host, int port, int alternatePort) {
@@ skipping 25 matching lines @@
         private static final Pattern INVALID_PKP_HOST_NAME = Pattern.compile("^[0-9\\.]*$");
 
         // Private fields are simply storage of configuration for the resulting CronetEngine.
         // See setters below for verbose descriptions.
         private final Context mContext;
         private final List<QuicHint> mQuicHints = new LinkedList<QuicHint>();
         private final List<Pkp> mPkps = new LinkedList<Pkp>();
         private String mUserAgent;
         private String mStoragePath;
         private boolean mLegacyModeEnabled;
-        private LibraryLoader mLibraryLoader;
         private String mLibraryName;
         private boolean mQuicEnabled;
         private boolean mHttp2Enabled;
         private boolean mSdchEnabled;
         private String mDataReductionProxyKey;
         private String mDataReductionProxyPrimaryProxy;
         private String mDataReductionProxyFallbackProxy;
         private String mDataReductionProxySecureProxyCheckUrl;
         private boolean mDisableCache;
         private int mHttpCacheMode;
@@ skipping 81 matching lines @@
 
         /**
          * Overrides the name of the native library backing Cronet.
          * @return the builder to facilitate chaining.
          */
         Builder setLibraryName(String libName) {
             mLibraryName = libName;
             return this;
         }
 
-        /**
-         * Sets a {@link LibraryLoader} to be used to load the native library.
-         * If not set, the library will be loaded using {@link System#loadLibrary}.
-         * @return the builder to facilitate chaining.
-         */
-        public Builder setLibraryLoader(LibraryLoader loader) {
-            mLibraryLoader = loader;
-            return this;
-        }
-
-        void loadLibrary() {
-            if (mLibraryLoader == null) {
-                System.loadLibrary(mLibraryName);
-            } else {
-                mLibraryLoader.loadLibrary(mLibraryName);
-            }
+        String libraryName() {
+            return mLibraryName;
         }
 
         /**
          * Sets whether <a href="https://www.chromium.org/quic">QUIC</a> protocol
          * is enabled. Defaults to disabled.
          * @return the builder to facilitate chaining.
          */
         public Builder enableQUIC(boolean value) {
             mQuicEnabled = value;
             return this;
@@ skipping 824 matching lines @@
      * Interface to listen for finished requests that were created via this CronetEngine instance.
      *
      * @deprecated not really deprecated but hidden for now as it's a prototype.
      */
     @Deprecated
     public interface RequestFinishedListener { // TODO(klm): Add a convenience abstract class.
         /** Invoked with request info. */
         void onRequestFinished(UrlRequestInfo requestInfo);
     }
 }