Merge UrlRequest.java into ChromiumUrlRequest.java

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

Index: components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestFactory.java
diff --git a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestFactory.java b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestFactory.java
index 8efb82befa7903a0b23a779e74f49c42e7f7e9d3..dabed9f6452bd86bf7110cd1222553f6430c271d 100644
--- a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestFactory.java
+++ b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestFactory.java
@@ -15,14 +15,14 @@ import java.util.Map;
  */
 @UsedByReflection("HttpUrlRequestFactory.java")
 public class ChromiumUrlRequestFactory extends HttpUrlRequestFactory {
-    private UrlRequestContext mRequestContext;
+    private ChromiumUrlRequestContext mRequestContext;
 
     @UsedByReflection("HttpUrlRequestFactory.java")
     public ChromiumUrlRequestFactory(
             Context context, HttpUrlRequestFactoryConfig config) {
         if (isEnabled()) {
             System.loadLibrary("cronet");
-            mRequestContext = new UrlRequestContext(
+            mRequestContext = new ChromiumUrlRequestContext(
                     context.getApplicationContext(), UserAgent.from(context),
                     config.toString());
         }
@@ -35,7 +35,7 @@ public class ChromiumUrlRequestFactory extends HttpUrlRequestFactory {
 
     @Override
     public String getName() {
-        return "Chromium/" + UrlRequestContext.getVersion();
+        return "Chromium/" + ChromiumUrlRequestContext.getVersion();
     }
 
     @Override
@@ -52,4 +52,8 @@ public class ChromiumUrlRequestFactory extends HttpUrlRequestFactory {
         return new ChromiumUrlRequest(mRequestContext, url, requestPriority,
                 headers, channel, listener);
     }
+
+    public ChromiumUrlRequestContext getRequestContext() {
+        return mRequestContext;
+    }
 }