[Cronet] Get Cronet performance test running again

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;
 
@@ skipping 145 matching lines @@
     protected void registerHostResolver(CronetTestFramework framework) {
         registerHostResolver(framework, false);
     }
 
     /**
      * Registers test host resolver.
      *
      * @param isLegacyAPI true if the test should use the legacy API.
      */
     protected void registerHostResolver(CronetTestFramework framework, boolean isLegacyAPI) {
-        long urlRequestContextAdapter;
         if (isLegacyAPI) {
-            urlRequestContextAdapter = ((ChromiumUrlRequestFactory) framework.mRequestFactory)
-                                               .getRequestContext()
-                                               .getUrlRequestContextAdapter();
+            CronetTestUtil.registerHostResolverProc(framework.mRequestFactory, "127.0.0.1");

[mef, 2016/01/26 21:45:03]

nit: maybe make a const?

[pauljensen, 2016/01/29 17:10:09]

Done.

         } else {
-            urlRequestContextAdapter = ((CronetUrlRequestContext) framework.mCronetEngine)
-                                               .getUrlRequestContextAdapter();
+            CronetTestUtil.registerHostResolverProc(framework.mCronetEngine, "127.0.0.1");
         }
-        NativeTestServer.registerHostResolverProc(urlRequestContextAdapter, isLegacyAPI);
     }
 
     @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 {}
 }