Add host resolver rules experimental flag for Cronet

components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.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.os.ConditionVariable;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;
 import org.chromium.net.impl.ChromiumUrlRequestFactory;
 import org.chromium.net.impl.CronetUrlRequestContext;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
  * Tests Sdch support.
  */
 public class SdchTest extends CronetTestBase {
     private CronetTestFramework mTestFramework;
 
     private enum Sdch {
         ENABLED,
         DISABLED,
     }
 
     private enum Api {
         LEGACY,
         ASYNC,
     }
 
     @SuppressWarnings("deprecation")
-    private void setUp(Sdch setting, Api api) {
+    private void setUp(Sdch setting, Api api) throws JSONException {
         List<String> commandLineArgs = new ArrayList<String>();
         commandLineArgs.add(CronetTestFramework.CACHE_KEY);
         commandLineArgs.add(CronetTestFramework.CACHE_DISK);
         if (setting == Sdch.ENABLED) {
             commandLineArgs.add(CronetTestFramework.SDCH_KEY);
             commandLineArgs.add(CronetTestFramework.SDCH_ENABLE);
         }
 
         if (api == Api.LEGACY) {
             commandLineArgs.add(CronetTestFramework.LIBRARY_INIT_KEY);
             commandLineArgs.add(CronetTestFramework.LibraryInitType.LEGACY);
         } else {
             commandLineArgs.add(CronetTestFramework.LIBRARY_INIT_KEY);
             commandLineArgs.add(CronetTestFramework.LibraryInitType.CRONET);
         }
 
         String[] args = new String[commandLineArgs.size()];
-        mTestFramework = startCronetTestFrameworkWithUrlAndCommandLineArgs(
-                null, commandLineArgs.toArray(args));
-        registerHostResolver(mTestFramework, api == Api.LEGACY);
+        CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
+        JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules();
+        JSONObject experimentalOptions =
+                new JSONObject().put("HostResolverRules", hostResolverParams);
+        builder.setExperimentalOptions(experimentalOptions.toString());
+        mTestFramework =
+                new CronetTestFramework(null, commandLineArgs.toArray(args), getContext(), builder);
         // Start NativeTestServer.
         assertTrue(NativeTestServer.startNativeTestServer(getContext()));
     }
 
     @Override
     protected void tearDown() throws Exception {
         NativeTestServer.shutdownNativeTestServer();
         super.tearDown();
     }
 
@@ skipping 86 matching lines @@
                 callback1.mResponseInfo.getAllHeaders().get("Get-Dictionary"));
 
         observer.waitForDictionaryAdded();
 
         // Make a request to fetch encoded response at /sdch/test.
         TestUrlRequestCallback callback2 =
                 startAndWaitForComplete(mTestFramework.mCronetEngine, targetUrl);
         assertEquals(200, callback2.mResponseInfo.getHttpStatusCode());
         assertEquals("The quick brown fox jumps over the lazy dog.\n", callback2.mResponseAsString);
 
-        // Wait for a bit until SimpleCache finished closing entries before
-        // calling shutdown on the CronetEngine.
-        // TODO(xunjieli): Remove once crbug.com/486120 is fixed.
-        Thread.sleep(5000);
         mTestFramework.mCronetEngine.shutdown();
 
         // Shutting down the context will make JsonPrefStore to flush pending
         // writes to disk.
         String dictUrl = NativeTestServer.getSdchURL() + "/sdch/dict/LeQxM80O";
         assertTrue(fileContainsString("local_prefs.json", dictUrl));
 
         // Test persistence.
         mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(
                 null, mTestFramework.getCronetEngineBuilder());
         CronetUrlRequestContext newContext = (CronetUrlRequestContext) mTestFramework.mCronetEngine;
         long newContextAdapter = getContextAdapter(newContext);
-        registerHostResolver(mTestFramework);
         DictionaryAddedObserver newObserver =
                 new DictionaryAddedObserver(targetUrl, newContextAdapter, false /** Legacy Api */);
         newObserver.waitForDictionaryAdded();
 
         // Make a request to fetch encoded response at /sdch/test.
         TestUrlRequestCallback callback3 = startAndWaitForComplete(newContext, targetUrl);
         assertEquals(200, callback3.mResponseInfo.getHttpStatusCode());
         assertEquals("The quick brown fox jumps over the lazy dog.\n", callback3.mResponseAsString);
     }
 
@@ skipping 91 matching lines @@
         while ((line = reader.readLine()) != null) {
             if (line.contains(content)) {
                 reader.close();
                 return true;
             }
         }
         reader.close();
         return false;
     }
 }