Cronet: Fix CronetUploadTest.testDestroyAdapterBefore* tests.

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java
index 218cbf6bb7a2973163d4ff4459b3321353be870c..d3294ea30113ce48f5b539d8cf8c032149c10d55 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java
@@ -22,8 +22,6 @@ 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 {
@@ -33,8 +31,8 @@ public class CronetUploadTest extends CronetTestBase {
         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
@@ -241,9 +239,10 @@ public class CronetUploadTest extends CronetTestBase {
         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++ object, which should eventually result in calling the
+        // CronetUploadDataSteam's onAdapterDestroyed() method, which should
+        // destroy the CronetUploadDataStreamAdapter.

[xunjieli, 2015/04/24 18:01:10]

nit: onAdapterDestroyed() destroys the CronetUploadDataStreamDelegate (not the
CronetUploadDataStreamAdapter).

Maybe also mention the fact that CronetUploadDataStreamAdapter is owned by the
native TestUploadDataStreamHandler, if we destroy the native
TestUploadDataStreamHandler, the CronetUploadDataStreamAdapter will also be
destroyed(.. which will invoke CronetUploadDataStream's onAdapterDestroyed()
method which will then destroy CronetUploadDataStreamDelegate).

Now I think about it, our naming scheme is confusing. 
We probably should rename cronet_upload_data_stream_delegate.cc as
cronet_upload_data_stream_adapter.cc, and cronet_upload_data_stream_adapter.cc
as cronet_upload_data_stream.cc (since cronet_upload_data_stream_adapter is
really an upload_data_stream).

[mmenke, 2015/04/24 18:22:17]

Fixed.
Done.
You're absolutely right about this.  My fault.  I'm happy to fix this after my
week off (Or this afternoon, if I have time).

+        mHandler.destroyNativeObjects();
 
         // Make the read complete should not encounter a crash.
         mDataProvider.onReadSucceeded(mUploadDataStream);
@@ -282,15 +281,13 @@ public class CronetUploadTest extends CronetTestBase {
         mDataProvider.waitForRewindRequest();
         mHandler.checkInitCallbackNotInvoked();
 
-        // Destroy the C++ object, which should trigger the Java
-        // onAdapterDestroyed().
-        mAdapter = 0;
+        // Destroy the C++ object, which should eventually result in calling the
+        // CronetUploadDataSteam's onAdapterDestroyed() method, which should
+        // destroy the CronetUploadDataStreamAdapter.
+        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());