Cherry-pick https://crrev.com/c/4747040

Original commit message:
Flip enable_telemetry to default to true

Bug: 284972285
Change-Id: I8694ab3a746c9a8c3b2846ca6f44d44b4538ce10

2 files changed, 32 insertions, 5 deletions

diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
index 98fe4c457..0127dd9fe 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
@@ -129,13 +129,13 @@ public class ExperimentalOptionsTest {
     @Test
     @MediumTest
     @OnlyRunNativeCronet
-    public void testEnableTelemetryTrue() throws Exception {
-        JSONObject experimentalOptions = new JSONObject().put("enable_telemetry", true);
+    public void testEnableTelemetryFalse() throws Exception {
+        JSONObject experimentalOptions = new JSONObject().put("enable_telemetry", false);
         mBuilder.setExperimentalOptions(experimentalOptions.toString());
 
         CronetEngine cronetEngine = mBuilder.build();
         CronetUrlRequestContext context = (CronetUrlRequestContext) mBuilder.build();
-        assertTrue(context.getEnableTelemetryForTesting());
+        assertFalse(context.getEnableTelemetryForTesting());
         cronetEngine.shutdown();
     }
 
@@ -145,7 +145,7 @@ public class ExperimentalOptionsTest {
     public void testEnableTelemetryDefault() throws Exception {
         CronetEngine cronetEngine = mBuilder.build();
         CronetUrlRequestContext context = (CronetUrlRequestContext) mBuilder.build();
-        assertFalse(context.getEnableTelemetryForTesting());
+        assertTrue(context.getEnableTelemetryForTesting());
         cronetEngine.shutdown();
     }
 
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java
index 8640cb52d..e49a290ed 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java
@@ -227,7 +227,7 @@ public final class CronetLoggerTest {
     @Test
     @SmallTest
     @OnlyRunNativeCronet
-    public void testTelemetryDefaultDisabled() throws JSONException {
+    public void testTelemetryDefaultEnabled() throws JSONException {
         final String url = NativeTestServer.getEchoBodyURL();
 
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
@@ -237,6 +237,33 @@ public final class CronetLoggerTest {
         UrlRequest request = requestBuilder.build();
         request.start();
         callback.blockForDone();
+        assertFalse(callback.mOnCanceledCalled);
+        assertFalse(callback.mOnErrorCalled);
+        mTestLogger.waitForLogCronetTrafficInfo();
+
+        // Test-logger should be bypassed.
+        assertEquals(1, mTestLogger.callsToLogCronetEngineCreation());
+        assertEquals(1, mTestLogger.callsToLogCronetTrafficInfo());
+    }
+
+    @Test
+    @SmallTest
+    @OnlyRunNativeCronet
+    public void testTelemetryDisabled() throws JSONException {
+        final String url = NativeTestServer.getEchoBodyURL();
+        JSONObject jsonExperimentalOptions = new JSONObject().put("enable_telemetry", false);
+        final String experimentalOptions = jsonExperimentalOptions.toString();
+        ExperimentalCronetEngine.Builder builder =
+                (ExperimentalCronetEngine.Builder) mTestFramework.mBuilder;
+        builder.setExperimentalOptions(experimentalOptions);
+        CronetEngine engine = mTestFramework.startEngine();
+
+        TestUrlRequestCallback callback = new TestUrlRequestCallback();
+        UrlRequest.Builder requestBuilder =
+                engine.newUrlRequestBuilder(url, callback, callback.getExecutor());
+        UrlRequest request = requestBuilder.build();
+        request.start();
+        callback.blockForDone();
 
         // Test-logger should be bypassed.
         assertEquals(0, mTestLogger.callsToLogCronetEngineCreation());