Add HttpUrlConnection backed implementation of CronetEngine.

components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.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.test.AndroidTestCase;
 
 import org.chromium.base.PathUtils;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.Method;
 import java.net.URL;
 
 /**
  * Base test class for all CronetTest based tests.
  */
 public class CronetTestBase extends AndroidTestCase {
     private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "cronet_test";
 
     private CronetTestFramework mCronetTestFramework;
     // {@code true} when test is being run against system HttpURLConnection implementation.
     private boolean mTestingSystemHttpURLConnection;
+    private boolean mTestingJavaImpl = false;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, getContext());
         CronetTestFramework.prepareTestStorage(getContext());
     }
 
     /**
      * Starts the CronetTest framework.
@@ skipping 51 matching lines @@
         return mCronetTestFramework;
     }
 
     /**
      * Returns {@code true} when test is being run against system HttpURLConnection implementation.
      */
     protected boolean testingSystemHttpURLConnection() {
         return mTestingSystemHttpURLConnection;
     }
 
+    /**
+     * Returns {@code true} when test is being run against the java implementation of CronetEngine.
+     */
+    protected boolean testingJavaImpl() {
+        return mTestingJavaImpl;
+    }
+
     @Override
     protected void runTest() throws Throwable {
         mTestingSystemHttpURLConnection = false;
-        if (!getClass().getPackage().getName().equals(
-                "org.chromium.net.urlconnection")) {
+        mTestingJavaImpl = false;
+        String packageName = getClass().getPackage().getName();
+        if (packageName.equals("org.chromium.net.urlconnection")) {
+            try {
+                Method method = getClass().getMethod(getName(), (Class[]) null);
+                if (method.isAnnotationPresent(CompareDefaultWithCronet.class)) {
+                    // Run with the default HttpURLConnection implementation first.
+                    mTestingSystemHttpURLConnection = true;
+                    super.runTest();
+                    // Use Cronet's implementation, and run the same test.
+                    mTestingSystemHttpURLConnection = false;
+                    URL.setURLStreamHandlerFactory(mCronetTestFramework.mStreamHandlerFactory);
+                    super.runTest();
+                } else if (method.isAnnotationPresent(OnlyRunCronetHttpURLConnection.class)) {
+                    // Run only with Cronet's implementation.
+                    URL.setURLStreamHandlerFactory(mCronetTestFramework.mStreamHandlerFactory);
+                    super.runTest();
+                } else {
+                    // For all other tests.
+                    super.runTest();
+                }
+            } catch (Throwable e) {
+                throw new Throwable("CronetTestBase#runTest failed.", e);
+            }
+        } else if (packageName.equals("org.chromium.net")) {
+            try {
+                Method method = getClass().getMethod(getName(), (Class[]) null);
+                super.runTest();
+                if (!method.isAnnotationPresent(OnlyRunNativeCronet.class)) {
+                    if (mCronetTestFramework != null) {
+                        mCronetTestFramework.mCronetEngine =
+                                new JavaCronetEngine(UserAgent.from(getContext()));
+                    }
+                    mTestingJavaImpl = true;
+                    super.runTest();
+                }
+            } catch (Throwable e) {
+                throw new Throwable("CronetTestBase#runTest failed.", e);
+            }
+        } else {
             super.runTest();
-            return;
-        }
-        try {
-            Method method = getClass().getMethod(getName(), (Class[]) null);
-            if (method.isAnnotationPresent(CompareDefaultWithCronet.class)) {
-                // Run with the default HttpURLConnection implementation first.
-                mTestingSystemHttpURLConnection = true;
-                super.runTest();
-                // Use Cronet's implementation, and run the same test.
-                mTestingSystemHttpURLConnection = false;
-                URL.setURLStreamHandlerFactory(mCronetTestFramework.mStreamHandlerFactory);
-                super.runTest();
-            } else if (method.isAnnotationPresent(
-                    OnlyRunCronetHttpURLConnection.class)) {
-                // Run only with Cronet's implementation.
-                URL.setURLStreamHandlerFactory(mCronetTestFramework.mStreamHandlerFactory);
-                super.runTest();
-            } else {
-                // For all other tests.
-                super.runTest();
-            }
-        } catch (Throwable e) {
-            throw new Throwable("CronetTestBase#runTest failed.", e);
         }
     }
 
     /**
      * Registers test host resolver for testing with the new API.
      */
     protected void registerHostResolver(CronetTestFramework framework) {
         registerHostResolver(framework, false);
     }
 
@@ skipping 18 matching lines @@
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.RUNTIME)
     public @interface CompareDefaultWithCronet {
     }
 
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.RUNTIME)
     public @interface OnlyRunCronetHttpURLConnection {
     }
 
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface OnlyRunNativeCronet {}

[pauljensen, 2016/01/07 04:33:38]

can you make these braces match those on lines 180 and 185?

[Charles, 2016/01/07 16:10:02]

Done.

 }