Revert of [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 119 matching lines @@
             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 406 matching lines @@
     @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;
     }
 }