Fix of flaky SdchTest#testSdchEnabled test.

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

 // Copyright 2015 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.os.ConditionVariable;
 import android.support.test.filters.SmallTest;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.impl.CronetUrlRequestContext;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ skipping 46 matching lines @@
     }
 
     @SmallTest
     @Feature({"Cronet"})
     @OnlyRunNativeCronet
     public void testSdchEnabled() throws Exception {
         setUp(Sdch.ENABLED);
         String targetUrl = NativeTestServer.getSdchURL() + "/sdch/test";
         long contextAdapter =
                 getContextAdapter((CronetUrlRequestContext) mTestFramework.mCronetEngine);
-        DictionaryAddedObserver observer = new DictionaryAddedObserver(targetUrl, contextAdapter);
+        SdchObserver observer = new SdchObserver(targetUrl, contextAdapter);
 
         // Make a request to /sdch which advertises the dictionary.
         TestUrlRequestCallback callback1 = startAndWaitForComplete(mTestFramework.mCronetEngine,
                 NativeTestServer.getSdchURL() + "/sdch/index?q=LeQxM80O");
         assertEquals(200, callback1.mResponseInfo.getHttpStatusCode());
         assertEquals("This is an index page.\n", callback1.mResponseAsString);
         assertEquals(Arrays.asList("/sdch/dict/LeQxM80O"),
                 callback1.mResponseInfo.getAllHeaders().get("Get-Dictionary"));
 
         observer.waitForDictionaryAdded();
 
         // Make a request to fetch encoded response at /sdch/test.
         TestUrlRequestCallback callback2 =
                 startAndWaitForComplete(mTestFramework.mCronetEngine, targetUrl);
         assertEquals(200, callback2.mResponseInfo.getHttpStatusCode());
         assertEquals("The quick brown fox jumps over the lazy dog.\n", callback2.mResponseAsString);
 
         mTestFramework.mCronetEngine.shutdown();
 
         // Shutting down the context will make JsonPrefStore to flush pending
         // writes to disk.
         String dictUrl = NativeTestServer.getSdchURL() + "/sdch/dict/LeQxM80O";
         assertTrue(fileContainsString("local_prefs.json", dictUrl));
 
         // Test persistence.
         mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(
                 null, mTestFramework.getCronetEngineBuilder());
         CronetUrlRequestContext newContext = (CronetUrlRequestContext) mTestFramework.mCronetEngine;
         long newContextAdapter = getContextAdapter(newContext);
-        DictionaryAddedObserver newObserver =
-                new DictionaryAddedObserver(targetUrl, newContextAdapter);
+        SdchObserver newObserver = new SdchObserver(targetUrl, newContextAdapter);
         newObserver.waitForDictionaryAdded();
 
         // Make a request to fetch encoded response at /sdch/test.
         TestUrlRequestCallback callback3 = startAndWaitForComplete(newContext, targetUrl);
         assertEquals(200, callback3.mResponseInfo.getHttpStatusCode());
         assertEquals("The quick brown fox jumps over the lazy dog.\n", callback3.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
@@ skipping 23 matching lines @@
         assertEquals(Arrays.asList("/sdch/dict/NotFound"),
                 callback1.mResponseInfo.getAllHeaders().get("Get-Dictionary"));
 
         // Make a request to fetch /sdch/test, and make sure Sdch encoding is not used.
         TestUrlRequestCallback callback2 = startAndWaitForComplete(
                 mTestFramework.mCronetEngine, NativeTestServer.getSdchURL() + "/sdch/test");
         assertEquals(200, callback2.mResponseInfo.getHttpStatusCode());
         assertEquals("Sdch is not used.\n", callback2.mResponseAsString);
     }
 
-    private static class DictionaryAddedObserver extends SdchObserver {
-        private final ConditionVariable mBlock;
-
-        public DictionaryAddedObserver(String targetUrl, long contextAdapter) {
-            super(targetUrl, contextAdapter);
-            mBlock = new ConditionVariable();
-        }
-
-        @Override
-        public void onDictionaryAdded() {
-            mBlock.open();
-        }
-
-        public void waitForDictionaryAdded() {
-            if (!mDictionaryAlreadyPresent) {
-                mBlock.block();
-                mBlock.close();
-            }
-        }
-    }
-
     private long getContextAdapter(CronetUrlRequestContext requestContext) {
         return requestContext.getUrlRequestContextAdapter();
     }
 
     private TestUrlRequestCallback startAndWaitForComplete(CronetEngine cronetEngine, String url)
             throws Exception {
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
         UrlRequest.Builder builder =
                 cronetEngine.newUrlRequestBuilder(url, callback, callback.getExecutor());
         builder.build().start();
         callback.blockForDone();
         return callback;
     }
 
     // Returns whether a file contains a particular string.
     private boolean fileContainsString(String filename, String content) throws IOException {
         BufferedReader reader = new BufferedReader(new FileReader(
                 CronetTestFramework.getTestStorage(getContext()) + "/prefs/" + filename));
         String line;
         while ((line = reader.readLine()) != null) {
             if (line.contains(content)) {
                 reader.close();
                 return true;
             }
         }
         reader.close();
         return false;
     }
 }