[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

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

Index: components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java
diff --git a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java
index 7bae2883221d5340a4ddbb23c19c9bf4865d978a..0394baee4f378406f270225484bf8aaca872b292 100644
--- a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java
+++ b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java
@@ -4,7 +4,6 @@
 
 package org.chromium.net;
 
-import android.content.Context;
 import android.os.Build;
 import android.os.ConditionVariable;
 import android.os.Handler;
@@ -22,11 +21,11 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * UrlRequestContext using Chromium HTTP stack implementation.
+ * CronetEngine using Chromium HTTP stack implementation.
  */
 @JNINamespace("cronet")
-@UsedByReflection("UrlRequestContext.java")
-class CronetUrlRequestContext extends UrlRequestContext {
+@UsedByReflection("CronetEngine.java")
+class CronetUrlRequestContext extends CronetEngine {
     private static final int LOG_NONE = 3;  // LOG(FATAL), no VLOG.
     private static final int LOG_DEBUG = -1;  // LOG(FATAL...INFO), VLOG(1)
     private static final int LOG_VERBOSE = -2;  // LOG(FATAL...INFO), VLOG(2)
@@ -42,12 +41,11 @@ class CronetUrlRequestContext extends UrlRequestContext {
     private long mUrlRequestContextAdapter = 0;
     private Thread mNetworkThread;
 
-    @UsedByReflection("UrlRequestContext.java")
-    public CronetUrlRequestContext(Context context,
-                                   UrlRequestContextConfig config) {
-        CronetLibraryLoader.ensureInitialized(context, config);
+    @UsedByReflection("CronetEngine.java")
+    public CronetUrlRequestContext(CronetEngine.Builder builder) {
+        CronetLibraryLoader.ensureInitialized(builder.getContext(), builder);
         nativeSetMinLogLevel(getLoggingLevel());
-        mUrlRequestContextAdapter = nativeCreateRequestContextAdapter(config.toString());
+        mUrlRequestContextAdapter = nativeCreateRequestContextAdapter(builder.toString());
         if (mUrlRequestContextAdapter == 0) {
             throw new NullPointerException("Context Adapter creation failed.");
         }
@@ -78,7 +76,7 @@ class CronetUrlRequestContext extends UrlRequestContext {
         synchronized (mLock) {
             checkHaveAdapter();
             return new CronetUrlRequest(this, mUrlRequestContextAdapter, url,
-                    UrlRequest.REQUEST_PRIORITY_MEDIUM, listener, executor);
+                    UrlRequest.Builder.REQUEST_PRIORITY_MEDIUM, listener, executor);
         }
     }
 
@@ -174,7 +172,7 @@ class CronetUrlRequestContext extends UrlRequestContext {
 
     private void checkHaveAdapter() throws IllegalStateException {
         if (!haveRequestContextAdapter()) {
-            throw new IllegalStateException("Context is shut down.");
+            throw new IllegalStateException("Engine is shut down.");
         }
     }