[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

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

 // Copyright 2014 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.os.Build;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.util.Log;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeClassQualifiedName;
 import org.chromium.base.annotations.UsedByReflection;
 
 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)
     static final String LOG_TAG = "ChromiumNetwork";
 
     /**
      * Synchronize access to mUrlRequestContextAdapter and shutdown routine.
      */
     private final Object mLock = new Object();
     private final ConditionVariable mInitCompleted = new ConditionVariable(false);
     private final AtomicInteger mActiveRequestCount = new AtomicInteger(0);
 
     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(Context context, CronetEngine.Builder builder) {
+        CronetLibraryLoader.ensureInitialized(context, builder);
         nativeSetMinLogLevel(getLoggingLevel());
-        mUrlRequestContextAdapter = nativeCreateRequestContextAdapter(config.toString());
+        mUrlRequestContextAdapter = nativeCreateRequestContextAdapter(builder.toString());
         if (mUrlRequestContextAdapter == 0) {
             throw new NullPointerException("Context Adapter creation failed.");
         }
 
         // Init native Chromium URLRequestContext on main UI thread.
         Runnable task = new Runnable() {
             @Override
             public void run() {
                 synchronized (mLock) {
                     // mUrlRequestContextAdapter is guaranteed to exist until
@@ skipping 10 matching lines @@
             new Handler(Looper.getMainLooper()).post(task);
         }
     }
 
     @Override
     public UrlRequest createRequest(String url, UrlRequestListener listener,
                                     Executor executor) {
         synchronized (mLock) {
             checkHaveAdapter();
             return new CronetUrlRequest(this, mUrlRequestContextAdapter, url,
-                    UrlRequest.REQUEST_PRIORITY_MEDIUM, listener, executor);
+                    UrlRequest.Builder.REQUEST_PRIORITY_MEDIUM, listener, executor);
         }
     }
 
     @Override
     public UrlRequest createRequest(String url, UrlRequestListener listener,
                                     Executor executor, int priority) {
         synchronized (mLock) {
             checkHaveAdapter();
             return new CronetUrlRequest(this, mUrlRequestContextAdapter, url,
                     priority, listener, executor);
@@ skipping 128 matching lines @@
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeStartNetLogToFile(long nativePtr,
             String fileName, boolean logAll);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeStopNetLog(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeInitRequestContextOnMainThread(long nativePtr);
 }