[Cronet] Separate Cronet implementation and API by package name.

components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.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;
+package org.chromium.net.impl;
 
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.net.CronetEngine;
+import org.chromium.net.NetworkChangeNotifier;
 
 /**
  * CronetLibraryLoader loads and initializes native library on main thread.
  */
 @JNINamespace("cronet")
-class CronetLibraryLoader {
+@VisibleForTesting
+public class CronetLibraryLoader {
     // Synchronize initialization.
     private static final Object sLoadLock = new Object();
     private static final String TAG = "CronetLibraryLoader";
     // Has library loading commenced?  Setting guarded by sLoadLock.
     private static volatile boolean sInitStarted = false;
     // Has ensureMainThreadInitialized() completed?  Only accessed on main thread.
     private static boolean sMainThreadInitDone = false;
 
     /**
      * Ensure that native library is loaded and initialized. Can be called from
      * any thread, the load and initialization is performed on main thread.
      */
-    static void ensureInitialized(final Context context, final CronetEngine.Builder builder) {
+    public static void ensureInitialized(
+            final Context context, final CronetEngine.Builder builder) {
         synchronized (sLoadLock) {
             if (sInitStarted) {
                 return;
             }
             sInitStarted = true;
             ContextUtils.initApplicationContext(context.getApplicationContext());
             builder.loadLibrary();
             ContextUtils.initApplicationContextForNative();
-            if (!Version.CRONET_VERSION.equals(nativeGetCronetVersion())) {
-                throw new RuntimeException(String.format(
-                      "Expected Cronet version number %s, "
-                              + "actual version number %s.",
-                      Version.CRONET_VERSION,
-                      nativeGetCronetVersion()));
+            if (!ImplVersion.CRONET_VERSION.equals(nativeGetCronetVersion())) {
+                throw new RuntimeException(String.format("Expected Cronet version number %s, "
+                                + "actual version number %s.",
+                        ImplVersion.CRONET_VERSION, nativeGetCronetVersion()));
             }
-            Log.i(TAG, "Cronet version: %s, arch: %s",
-                    Version.CRONET_VERSION, System.getProperty("os.arch"));
+            Log.i(TAG, "Cronet version: %s, arch: %s", ImplVersion.CRONET_VERSION,
+                    System.getProperty("os.arch"));
             // Init native Chromium CronetEngine on Main UI thread.
             Runnable task = new Runnable() {
                 @Override
                 public void run() {
                     ensureInitializedOnMainThread(context);
                 }
             };
             // Run task immediately or post it to the UI thread.
             if (Looper.getMainLooper() == Looper.myLooper()) {
                 task.run();
@@ skipping 28 matching lines @@
         // the undesired initial network change observer notification, which
         // will cause active requests to fail with ERR_NETWORK_CHANGED.
         nativeCronetInitOnMainThread();
         sMainThreadInitDone = true;
     }
 
     // Native methods are implemented in cronet_library_loader.cc.
     private static native void nativeCronetInitOnMainThread();
     private static native String nativeGetCronetVersion();
 }