Merge UrlRequest.java into ChromiumUrlRequest.java

components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java

Index: components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
diff --git a/components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java b/components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
index 96762787cc17370883f558a8b126ab55440d08c6..84ee97e2fdbe6edcbcf5935aeb2878c13c24797b 100644
--- a/components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
+++ b/components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
@@ -14,23 +14,19 @@ import android.util.Log;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import org.chromium.net.ChromiumUrlRequestFactory;
 import org.chromium.net.HttpUrlRequest;
 import org.chromium.net.HttpUrlRequestFactory;
 import org.chromium.net.HttpUrlRequestFactoryConfig;
 import org.chromium.net.HttpUrlRequestListener;
 import org.chromium.net.LibraryLoader;
-import org.chromium.net.UrlRequest;
-import org.chromium.net.UrlRequestContext;
-import org.chromium.net.UrlRequestPriority;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
-import java.nio.channels.WritableByteChannel;
 import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Activity for managing the Cronet Sample.
@@ -43,8 +39,7 @@ public class CronetSampleActivity extends Activity {
     public static final String POST_DATA_KEY = "postData";
     public static final String CONFIG_KEY = "config";
 
-    UrlRequestContext mRequestContext;
-
+    ChromiumUrlRequestFactory mChromiumRequestFactory;
     HttpUrlRequestFactory mRequestFactory;
 
     String mUrl;
@@ -53,43 +48,6 @@ public class CronetSampleActivity extends Activity {
 
     int mHttpStatusCode = 0;
 
-    class SampleRequestContext extends UrlRequestContext {
-        public SampleRequestContext() {
-            super(getApplicationContext(), "Cronet Sample",
-                  new HttpUrlRequestFactoryConfig().toString());
-        }
-    }
-
-    class SampleRequest extends UrlRequest {
-        public SampleRequest(UrlRequestContext requestContext, String url,
-                int priority, Map<String, String> headers,
-                WritableByteChannel sink) {
-            super(requestContext, url, priority, headers, sink);
-        }
-
-        @Override
-        protected void onRequestComplete() {
-            mHttpStatusCode = super.getHttpStatusCode();
-            Log.i(TAG, "****** Request Complete, status code is "
-                    + mHttpStatusCode);
-            Intent intent = new Intent(getApplicationContext(),
-                    CronetSampleActivity.class);
-            startActivity(intent);
-            final String url = super.getUrl();
-            final CharSequence text = "Completed " + url + " ("
-                    + mHttpStatusCode + ")";
-            CronetSampleActivity.this.runOnUiThread(new Runnable() {
-                public void run() {
-                    mLoading = false;
-                    Toast toast = Toast.makeText(getApplicationContext(), text,
-                            Toast.LENGTH_SHORT);
-                    toast.show();
-                    promptForURL(url);
-                }
-            });
-        }
-    }
-
     class SampleHttpUrlRequestListener implements HttpUrlRequestListener {
         public SampleHttpUrlRequestListener() {
         }
@@ -136,7 +94,6 @@ public class CronetSampleActivity extends Activity {
             return;
         }
 
-        mRequestContext = new SampleRequestContext();
         HttpUrlRequestFactoryConfig config = new HttpUrlRequestFactoryConfig();
         config.enableHttpCache(HttpUrlRequestFactoryConfig.HttpCache.IN_MEMORY,
                                100 * 1024)
@@ -159,6 +116,9 @@ public class CronetSampleActivity extends Activity {
         mRequestFactory = HttpUrlRequestFactory.createFactory(
                 getApplicationContext(), config);
 
+        mChromiumRequestFactory = new ChromiumUrlRequestFactory(
+                getApplicationContext(), config);
+
         String appUrl = getUrlFromIntent(getIntent());
         if (appUrl == null) {
             promptForURL("https://");
@@ -219,7 +179,7 @@ public class CronetSampleActivity extends Activity {
         }
     }
 
-    private void startWithURL(String url) {
+    public void startWithURL(String url) {
         Log.i(TAG, "Cronet started: " + url);
         mUrl = url;
         mLoading = true;
@@ -227,36 +187,11 @@ public class CronetSampleActivity extends Activity {
         HashMap<String, String> headers = new HashMap<String, String>();
         HttpUrlRequestListener listener = new SampleHttpUrlRequestListener();
         HttpUrlRequest request = mRequestFactory.createRequest(
-                url, UrlRequestPriority.MEDIUM, headers, listener);
+                url, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
         applyCommandLineToHttpUrlRequest(request);
         request.start();
     }
 
-    private void applyCommandLineToUrlRequest(UrlRequest request) {
-        String postData = getCommandLineArg(POST_DATA_KEY);
-        if (postData != null) {
-            InputStream dataStream = new ByteArrayInputStream(
-                    postData.getBytes());
-            ReadableByteChannel dataChannel = Channels.newChannel(dataStream);
-            request.setUploadChannel("text/plain", dataChannel,
-                    postData.length());
-            request.setHttpMethod("POST");
-        }
-    }
-
-    public void startWithURL_UrlRequest(String url) {
-        Log.i(TAG, "Cronet started: " + url);
-        mUrl = url;
-        mLoading = true;
-
-        HashMap<String, String> headers = new HashMap<String, String>();
-        WritableByteChannel sink = Channels.newChannel(System.out);
-        UrlRequest request = new SampleRequest(mRequestContext, url,
-                UrlRequestPriority.MEDIUM, headers, sink);
-        applyCommandLineToUrlRequest(request);
-        request.start();
-    }
-
     public String getUrl() {
         return mUrl;
     }
@@ -270,11 +205,12 @@ public class CronetSampleActivity extends Activity {
     }
 
     public void startNetLog() {
-        mRequestContext.startNetLogToFile(
-                Environment.getExternalStorageDirectory().getPath() + "/cronet_sample_netlog.json");
+        mChromiumRequestFactory.getRequestContext().startNetLogToFile(
+                Environment.getExternalStorageDirectory().getPath() +
+                        "/cronet_sample_netlog.json");
     }
 
     public void stopNetLog() {
-        mRequestContext.stopNetLog();
+        mChromiumRequestFactory.getRequestContext().stopNetLog();
     }
 }