[Cronet] Write effective experimental options to NetLog

components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.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.impl;
 
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
@@ skipping 130 matching lines @@
     private String mCertVerifierData;
 
     private ConditionVariable mStopNetLogCompleted;
 
     /**
      * True if a NetLog observer is active.
      */
     @GuardedBy("mLock")
     private boolean mIsLogging;
 
-    /**
-     * True if a NetLog observer that writes to disk with a bounded amount of space has been
-     * activated by calling StartNetLogToDisk().
-     */
-    @GuardedBy("mLock")
-    private boolean mNetLogToDisk;
-
     @UsedByReflection("CronetEngine.java")
     public CronetUrlRequestContext(final CronetEngineBuilderImpl builder) {
         CronetLibraryLoader.ensureInitialized(builder.getContext(), builder);
         nativeSetMinLogLevel(getLoggingLevel());
         synchronized (mLock) {
             mUrlRequestContextAdapter =
                     nativeCreateRequestContextAdapter(createNativeUrlRequestContextConfig(builder));
             if (mUrlRequestContextAdapter == 0) {
                 throw new NullPointerException("Context Adapter creation failed.");
             }
@@ skipping 106 matching lines @@
             }
             nativeDestroy(mUrlRequestContextAdapter);
             mUrlRequestContextAdapter = 0;
         }
     }
 
     @Override
     public void startNetLogToFile(String fileName, boolean logAll) {
         synchronized (mLock) {
             checkHaveAdapter();
-            if (!nativeStartNetLogToFile(mUrlRequestContextAdapter, fileName, logAll)) {
-                throw new RuntimeException("Unable to start NetLog");
-            }
+            nativeStartNetLogToFile(mUrlRequestContextAdapter, fileName, logAll);
             mIsLogging = true;
         }
     }
 
     @Override
     public void startNetLogToDisk(String dirPath, boolean logAll, int maxSize) {
         synchronized (mLock) {
             checkHaveAdapter();
             nativeStartNetLogToDisk(mUrlRequestContextAdapter, dirPath, logAll, maxSize);
             mIsLogging = true;
-            mNetLogToDisk = true;
         }
     }
 
     @Override
     public void stopNetLog() {
         synchronized (mLock) {
             if (!mIsLogging) {
                 return;
             }
             checkHaveAdapter();
             nativeStopNetLog(mUrlRequestContextAdapter);
             mIsLogging = false;
-            if (!mNetLogToDisk) {
-                return;
-            }
             mStopNetLogCompleted = new ConditionVariable();
         }
         mStopNetLogCompleted.block();
     }
 
     @CalledByNative
     public void stopNetLogCompleted() {
-        synchronized (mLock) {
-            mNetLogToDisk = false;
-        }
         mStopNetLogCompleted.open();
     }
 
     @Override
     public String getCertVerifierData(long timeout) {
         if (timeout < 0) {
             throw new IllegalArgumentException("timeout must be a positive value");
         } else if (timeout == 0) {
             timeout = 100;
         }
@@ skipping 377 matching lines @@
     private static native long nativeCreateRequestContextAdapter(long urlRequestContextConfig);
 
     private static native int nativeSetMinLogLevel(int loggingLevel);
 
     private static native byte[] nativeGetHistogramDeltas();
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeDestroy(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
-    private native boolean nativeStartNetLogToFile(long nativePtr, String fileName, boolean logAll);
+    private native void nativeStartNetLogToFile(long nativePtr, String fileName, boolean logAll);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeStartNetLogToDisk(
             long nativePtr, String dirPath, boolean logAll, int maxSize);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeStopNetLog(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeGetCertVerifierData(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeInitRequestContextOnMainThread(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeConfigureNetworkQualityEstimatorForTesting(long nativePtr,
             boolean useLocalHostRequests, boolean useSmallerResponses, boolean disableOfflineCheck);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideRTTObservations(long nativePtr, boolean should);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideThroughputObservations(long nativePtr, boolean should);
 
     public boolean isNetworkThread(Thread thread) {
         return thread == mNetworkThread;
     }
 }