[Cronet] Unit test refactoring and fixes

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;
@@ skipping 37 matching lines @@
             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));
-        long urlRequestContextAdapter = (api == Api.LEGACY)
-                ? getContextAdapter((ChromiumUrlRequestFactory) mTestFramework.mRequestFactory)
-                : getContextAdapter((CronetUrlRequestContext) mTestFramework.mCronetEngine);
-        NativeTestServer.registerHostResolverProc(urlRequestContextAdapter, api == Api.LEGACY);
+        registerHostResolver(mTestFramework, api == Api.LEGACY);
         // Start NativeTestServer.
         assertTrue(NativeTestServer.startNativeTestServer(getContext()));
     }
 
     @Override
     protected void tearDown() throws Exception {
         NativeTestServer.shutdownNativeTestServer();
         super.tearDown();
     }
 
@@ skipping 94 matching lines @@
         // 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.
-        CronetUrlRequestContext newContext =
-                new CronetUrlRequestContext(mTestFramework.getCronetEngineBuilder());
-
+        mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(
+                null, mTestFramework.getCronetEngineBuilder());
+        CronetUrlRequestContext newContext = (CronetUrlRequestContext) mTestFramework.mCronetEngine;
         long newContextAdapter = getContextAdapter(newContext);
-        NativeTestServer.registerHostResolverProc(newContextAdapter, false);
+        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 89 matching lines @@
         while ((line = reader.readLine()) != null) {
             if (line.contains(content)) {
                 reader.close();
                 return true;
             }
         }
         reader.close();
         return false;
     }
 }