Revert of [Cronet] Write effective experimental options to NetLog

components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java

 // Copyright 2016 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.support.test.filters.SmallTest;
 
 import org.json.JSONObject;
 
@@ skipping 28 matching lines @@
         assertTrue(Http2TestServer.shutdownHttp2TestServer());
         if (mTestFramework.mCronetEngine != null) {
             mTestFramework.mCronetEngine.shutdown();
         }
         super.tearDown();
     }
 
     @SmallTest
     @Feature({"Cronet"})
     @OnlyRunNativeCronet
-    // Tests that NetLog writes effective experimental options to NetLog.
-    public void testNetLog() throws Exception {
-        File directory = new File(PathUtils.getDataDirectory());
-        File logfile = File.createTempFile("cronet", "json", directory);
-        JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules();
-        JSONObject experimentalOptions =
-                new JSONObject().put("HostResolverRules", hostResolverParams);
-        mBuilder.setExperimentalOptions(experimentalOptions.toString());
-
-        mTestFramework = new CronetTestFramework(null, null, getContext(), mBuilder);
-        mTestFramework.mCronetEngine.startNetLogToFile(logfile.getPath(), false);
-        String url = Http2TestServer.getEchoMethodUrl();
-        TestUrlRequestCallback callback = new TestUrlRequestCallback();
-        UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
-                url, callback, callback.getExecutor());
-        UrlRequest urlRequest = builder.build();
-        urlRequest.start();
-        callback.blockForDone();
-        assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
-        assertEquals("GET", callback.mResponseAsString);
-        mTestFramework.mCronetEngine.stopNetLog();
-        assertTrue(logfile.exists());
-        assertTrue(logfile.length() != 0);
-        BufferedReader logReader = new BufferedReader(new FileReader(logfile));
-        boolean validFile = false;
-        try {
-            String logLine;
-            while ((logLine = logReader.readLine()) != null) {
-                if (logLine.contains("HostResolverRules")) {
-                    validFile = true;
-                    break;
-                }
-            }
-        } finally {
-            logReader.close();
-        }
-        assertTrue(validFile);
-        assertTrue(logfile.delete());
-        assertTrue(!logfile.exists());
-    }
-
-    @SmallTest
-    @Feature({"Cronet"})
-    @OnlyRunNativeCronet
     public void testSetSSLKeyLogFile() throws Exception {
         String url = Http2TestServer.getEchoMethodUrl();
         File dir = new File(PathUtils.getDataDirectory());
         File file = File.createTempFile("ssl_key_log_file", "", dir);
 
         JSONObject experimentalOptions = new JSONObject().put("ssl_key_log_file", file.getPath());
         mBuilder.setExperimentalOptions(experimentalOptions.toString());
         mTestFramework = new CronetTestFramework(null, null, getContext(), mBuilder);
 
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
@@ skipping 18 matching lines @@
                 }
             }
         } finally {
             logReader.close();
         }
         assertTrue(validFile);
         assertTrue(file.delete());
         assertTrue(!file.exists());
     }
 }