Inject CanAddURLToHistory into TopSitesImpl

components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.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.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
  * Tests that directly drive {@code CronetUploadDataStream} and
  * {@code UploadDataProvider} to simulate different ordering of reset, init,
  * read, and rewind calls.
  */
 public class CronetUploadTest extends CronetTestBase {
     private TestDrivenDataProvider mDataProvider;
     private CronetUploadDataStream mUploadDataStream;
     private TestUploadDataStreamHandler mHandler;
-    // Address of native CronetUploadDataStreamAdapter object.
-    private long mAdapter = 0;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         launchCronetTestApp();
         ExecutorService executor = Executors.newSingleThreadExecutor();
         List<byte[]> reads = Arrays.asList("hello".getBytes());
         mDataProvider = new TestDrivenDataProvider(executor, reads);
         mUploadDataStream = new CronetUploadDataStream(mDataProvider, executor);
-        mAdapter = mUploadDataStream.createAdapterForTesting();
-        mHandler = new TestUploadDataStreamHandler(mAdapter);
+        mHandler = new TestUploadDataStreamHandler(
+            mUploadDataStream.createAdapterForTesting());
     }
 
     @Override
     protected void tearDown() throws Exception {
         // Destroy handler's native objects.
         mHandler.destroyNativeObjects();
         super.tearDown();
     }
 
     /**
@@ skipping 186 matching lines @@
     @SmallTest
     @Feature({"Cronet"})
     public void testDestroyAdapterBeforeReadComplete()
             throws Exception {
         // Start a read and wait for it to be pending.
         assertTrue(mHandler.init());
         mHandler.read();
         mDataProvider.waitForReadRequest();
         mHandler.checkReadCallbackNotInvoked();
 
-        // Destroy the C++ object, which should trigger the Java
-        // onAdapterDestroyed() which should block until the read completes.
-        mAdapter = 0;
+        // Destroy the C++ TestUploadDataStreamHandler.  The handler owns the
+        // CronetUploadDataStreamAdapter, which this will cause it to destroy on
+        // the network thread.  Destroying the adapter will result in calling
+        // the CronetUploadDataSteam's onAdapterDestroyed() method on its
+        // executor thread, which will then destroy the
+        // CronetUploadDataStreamDelegate.
+        mHandler.destroyNativeObjects();
 
         // Make the read complete should not encounter a crash.
         mDataProvider.onReadSucceeded(mUploadDataStream);
 
         assertEquals(0, mDataProvider.getNumRewindCalls());
         assertEquals(1, mDataProvider.getNumReadCalls());
     }
 
     /**
      * Tests that there is no crash when native CronetUploadDataStreamAdapter is
@@ skipping 18 matching lines @@
         assertEquals(1, mDataProvider.getNumReadCalls());
         assertEquals("hello", mHandler.getData());
 
         // Reset and then init, which should trigger a rewind.
         mHandler.reset();
         assertEquals("", mHandler.getData());
         assertFalse(mHandler.init());
         mDataProvider.waitForRewindRequest();
         mHandler.checkInitCallbackNotInvoked();
 
-        // Destroy the C++ object, which should trigger the Java
-        // onAdapterDestroyed().
-        mAdapter = 0;
+        // Destroy the C++ TestUploadDataStreamHandler.  The handler owns the
+        // CronetUploadDataStreamAdapter, which this will cause it to destroy on
+        // the network thread.  Destroying the adapter will result in calling
+        // the CronetUploadDataSteam's onAdapterDestroyed() method on its
+        // executor thread, which will then destroy the
+        // CronetUploadDataStreamDelegate.
+        mHandler.destroyNativeObjects();
 
         // Signal rewind completes, and wait for init to complete.
-        mHandler.checkInitCallbackNotInvoked();
         mDataProvider.onRewindSucceeded(mUploadDataStream);
-        mHandler.waitForInitComplete();
-        mDataProvider.assertRewindNotPending();
 
         assertEquals(1, mDataProvider.getNumRewindCalls());
         assertEquals(1, mDataProvider.getNumReadCalls());
     }
 }