Add host resolver rules experimental flag for Cronet

components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java

 // Copyright 2015 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.annotation.SuppressLint;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ skipping 181 matching lines @@
             if (mProtocol == Protocol.QUIC) {
                 cronetEngineBuilder.enableQuic(true);
                 cronetEngineBuilder.addQuicHint(host, port, port);
                 cronetEngineBuilder.setMockCertVerifierForTesting(
                         MockCertVerifier.createMockCertVerifier(
                                 new String[] {getConfigString("QUIC_CERT_FILE")}, true));
             }
 
             try {
                 JSONObject quicParams = new JSONObject().put("host_whitelist", host);
-                JSONObject experimentalOptions = new JSONObject().put("QUIC", quicParams);
+                JSONObject hostResolverParams =
+                        CronetTestUtil.generateHostResolverRules(getConfigString("HOST_IP"));
+                JSONObject experimentalOptions =
+                        new JSONObject()
+                                .put("QUIC", quicParams)
+                                .put("HostResolverRules", hostResolverParams);
                 cronetEngineBuilder.setExperimentalOptions(experimentalOptions.toString());
             } catch (JSONException e) {
                 throw new IllegalStateException("JSON failed: " + e);
             }
             mCronetEngine = cronetEngineBuilder.build();
-            CronetTestUtil.registerHostResolverProc(mCronetEngine, getConfigString("HOST_IP"));
             mName = buildBenchmarkName(mode, direction, protocol, concurrency, mIterations);
             mConcurrency = concurrency;
             mResults = results;
             mBufferSize = mLength > getConfigInt("MAX_BUFFER_SIZE")
                     ? getConfigInt("MAX_BUFFER_SIZE")
                     : mLength;
             mUseNetworkThread = getConfigBoolean("CRONET_ASYNC_USE_NETWORK_THREAD");
         }
 
         private void startTimer() {
@@ skipping 390 matching lines @@
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, this);
         mConfig = getIntent().getData();
         // Execute benchmarks on another thread to avoid networking on main thread.
         new BenchmarkTask().execute();
     }
 }