[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java

Index: components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java
diff --git a/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java b/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java
index 9894ecd6fb7a676eadb60c79bb0786a2fd37fe32..dd887a073a28ad2e1a486ebb130fca751ea258db 100644
--- a/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java
+++ b/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java
@@ -25,13 +25,12 @@ class CronetLibraryLoader {
      * Ensure that native library is loaded and initialized. Can be called from
      * any thread, the load and initialization is performed on main thread.
      */
-    public static void ensureInitialized(
-            final Context context, final UrlRequestContextConfig config) {
+    public static void ensureInitialized(final CronetEngine.Builder builder) {
         synchronized (sLoadLock) {
             if (sInitTaskPosted) {
                 return;
             }
-            System.loadLibrary(config.libraryName());
+            System.loadLibrary(builder.libraryName());
             if (!Version.CRONET_VERSION.equals(nativeGetCronetVersion())) {
                 throw new RuntimeException(String.format(
                       "Expected Cronet version number %s, "
@@ -39,8 +38,9 @@ class CronetLibraryLoader {
                       Version.CRONET_VERSION,
                       nativeGetCronetVersion()));
             }
+            final Context context = builder.getContext();
             nativeCronetInitApplicationContext(context.getApplicationContext());
-            // Init native Chromium URLRequestContext on Main UI thread.
+            // Init native Chromium CronetEngine on Main UI thread.
             Runnable task = new Runnable() {
                 public void run() {
                     initOnMainThread(context);