Merge UrlRequest.java into ChromiumUrlRequest.java

components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.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.ConditionVariable;
 import android.os.Process;
 import android.util.Log;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 
 /**
  * Provides context for the native HTTP operations.
  */
 @JNINamespace("cronet")
-public class UrlRequestContext {
+public class ChromiumUrlRequestContext {
     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)
     private static final String LOG_TAG = "ChromiumNetwork";
 
     /**
-     * Native adapter object, owned by UrlRequestContext.
+     * Native adapter object, owned by ChromiumUrlRequestContext.
      */
-    private long mUrlRequestContextAdapter;
+    private long mChromiumUrlRequestContextAdapter;
 
     private final ConditionVariable mStarted = new ConditionVariable();
 
     /**
      * Constructor.
      *
      */
-    protected UrlRequestContext(Context context, String userAgent,
+    protected ChromiumUrlRequestContext(Context context, String userAgent,
             String config) {
-        mUrlRequestContextAdapter = nativeCreateRequestContextAdapter(context,
-                userAgent, getLoggingLevel(), config);
-        if (mUrlRequestContextAdapter == 0)
+        mChromiumUrlRequestContextAdapter = nativeCreateRequestContextAdapter(
+                context, userAgent, getLoggingLevel(), config);
+        if (mChromiumUrlRequestContextAdapter == 0)
             throw new NullPointerException("Context Adapter creation failed");
 
         // TODO(mef): Revisit the need of block here.
         mStarted.block(2000);
     }
 
     /**
      * Returns the version of this network stack formatted as N.N.N.N/X where
      * N.N.N.N is the version of Chromium and X is the revision number.
      */
@@ skipping 17 matching lines @@
         return nativeGetStatisticsJSON(filter);
     }
 
     /**
      * Starts NetLog logging to a file named |fileName| in the
      * application temporary directory. |fileName| must not be empty. Log level
      * is LOG_ALL_BUT_BYTES. If the file exists it is truncated before starting.
      * If actively logging the call is ignored.
      */
     public void startNetLogToFile(String fileName) {
-        nativeStartNetLogToFile(mUrlRequestContextAdapter, fileName);
+        nativeStartNetLogToFile(mChromiumUrlRequestContextAdapter, fileName);
     }
 
     /**
      * Stops NetLog logging and flushes file to disk. If a logging session is
      * not in progress this call is ignored.
      */
     public void stopNetLog() {
-        nativeStopNetLog(mUrlRequestContextAdapter);
+        nativeStopNetLog(mChromiumUrlRequestContextAdapter);
     }
 
     @CalledByNative
     private void initNetworkThread() {
         Thread.currentThread().setName("ChromiumNet");
         Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
         mStarted.open();
     }
 
     @Override
     protected void finalize() throws Throwable {
-        nativeReleaseRequestContextAdapter(mUrlRequestContextAdapter);
+        nativeReleaseRequestContextAdapter(mChromiumUrlRequestContextAdapter);
         super.finalize();
     }
 
-    protected long getUrlRequestContextAdapter() {
-        return mUrlRequestContextAdapter;
+    protected long getChromiumUrlRequestContextAdapter() {
+        return mChromiumUrlRequestContextAdapter;
     }
 
     /**
      * @return loggingLevel see {@link #LOG_NONE}, {@link #LOG_DEBUG} and
      *         {@link #LOG_VERBOSE}.
      */
     private int getLoggingLevel() {
         int loggingLevel;
         if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
             loggingLevel = LOG_VERBOSE;
         } else if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
             loggingLevel = LOG_DEBUG;
         } else {
             loggingLevel = LOG_NONE;
         }
         return loggingLevel;
     }
 
-    // Returns an instance URLRequestContextAdapter to be stored in
-    // mUrlRequestContextAdapter.
+    // Returns an instance ChromiumUrlRequestContextAdapter to be stored in
+    // mChromiumUrlRequestContextAdapter.
     private native long nativeCreateRequestContextAdapter(Context context,
             String userAgent, int loggingLevel, String config);
 
     private native void nativeReleaseRequestContextAdapter(
-            long urlRequestContextAdapter);
+            long ChromiumUrlRequestContextAdapter);
 
     private native void nativeInitializeStatistics();
 
     private native String nativeGetStatisticsJSON(String filter);
 
-    private native void nativeStartNetLogToFile(long urlRequestContextAdapter,
-            String fileName);
+    private native void nativeStartNetLogToFile(
+            long ChromiumUrlRequestContextAdapter, String fileName);
 
-    private native void nativeStopNetLog(long urlRequestContextAdapter);
+    private native void nativeStopNetLog(long ChromiumUrlRequestContextAdapter);
 }