[Cronet] Test the libcronet that's shipped, not libcronet_test

components/cronet/android/test/src/org/chromium/net/CronetTestFramework.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.content.Context;
 import android.os.Environment;
 
 import static junit.framework.Assert.assertEquals;
@@ skipping 177 matching lines @@
         } else if (CACHE_IN_MEMORY.equals(cacheString)) {
             cronetEngineBuilder.enableHttpCache(
                     CronetEngine.Builder.HTTP_CACHE_IN_MEMORY, 100 * 1024);
         }
 
         String sdchString = getCommandLineArg(SDCH_KEY);
         if (SDCH_ENABLE.equals(sdchString)) {
             cronetEngineBuilder.enableSdch(true);
         }
 
-        // Setting this here so it isn't overridden on the command line
-        CronetTestUtil.setLibraryName(cronetEngineBuilder, "cronet_tests");
         return cronetEngineBuilder;
     }
 
     // Helper function to initialize Cronet engine. Also used in testing.
     public CronetEngineBase initCronetEngine() {
         return (CronetEngineBase) mCronetEngineBuilder.build();
     }
 
     private String getCommandLineArg(String key) {
         if (mCommandLine != null) {
@@ skipping 13 matching lines @@
                     false);
         }
     }
 
     public void stopNetLog() {
         if (mCronetEngine != null) {
             mCronetEngine.stopNetLog();
         }
     }
 }