[Cronet] Create Builders, rename UrlRequestContext to CronetEngine

components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.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.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.PathUtils;
@@ skipping 43 matching lines @@
         assertEquals(200, activity.getHttpStatusCode());
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testNetLog() throws Exception {
         Context context = getInstrumentation().getTargetContext();
         File directory = new File(PathUtils.getDataDirectory(context));
         File file = File.createTempFile("cronet", "json", directory);
         HttpUrlRequestFactory factory = HttpUrlRequestFactory.createFactory(
-                context,
-                new UrlRequestContextConfig().setLibraryName("cronet_tests"));
+                new CronetEngine.Builder(context).setLibraryName("cronet_tests"));

[mef, 2015/10/02 16:46:58]

will this work?

[pauljensen, 2015/10/02 18:23:15]

I reverted this file.

         // Start NetLog immediately after the request context is created to make
         // sure that the call won't crash the app even when the native request
         // context is not fully initialized. See crbug.com/470196.
         factory.startNetLogToFile(file.getPath(), false);
         // Starts a request.
         HashMap<String, String> headers = new HashMap<String, String>();
         TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();
         HttpUrlRequest request = factory.createRequest(
                 URL, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
         request.start();
@@ skipping 52 matching lines @@
             request.setUploadData(null, uploadData);
             fail("setUploadData should throw on null content type");
         } catch (NullPointerException e) {
             // Nothing to do here.
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testLegacyLoadUrl() throws Exception {
-        HttpUrlRequestFactoryConfig config = new HttpUrlRequestFactoryConfig();
+        HttpUrlRequestFactoryConfig config = new HttpUrlRequestFactoryConfig(null);

[mef, 2015/10/02 16:46:58]

Can we get rid of null?

[pauljensen, 2015/10/02 18:23:15]

I reverted this file.

         config.enableLegacyMode(true);
         // TODO(mef) fix tests so that library isn't loaded for legacy stack
         config.setLibraryName("cronet_tests");
 
         String[] commandLineArgs = {
                 CronetTestActivity.CONFIG_KEY, config.toString() };
         CronetTestActivity activity =
                 launchCronetTestAppWithUrlAndCommandLineArgs(URL,
                                                              commandLineArgs);
 
@@ skipping 15 matching lines @@
                 URL, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
         request.setHttpMethod("HEAD");
         request.start();
         listener.blockForComplete();
         assertEquals(200, listener.mHttpStatusCode);
         // HEAD requests do not get any response data and Content-Length must be
         // ignored.
         assertEquals(0, listener.mResponseAsBytes.length);
     }
 }