Rename CronetUploadDataStreamAdapter to CronetUploadDataStream.

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;
 
@@ skipping 14 matching lines @@
 
     @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);
         mHandler = new TestUploadDataStreamHandler(
-            mUploadDataStream.createAdapterForTesting());
+                mUploadDataStream.createUploadDataStreamForTesting());
     }
 
     @Override
     protected void tearDown() throws Exception {
         // Destroy handler's native objects.
         mHandler.destroyNativeObjects();
         super.tearDown();
     }
 
     /**
@@ skipping 170 matching lines @@
         mHandler.checkInitCallbackNotInvoked();
         mDataProvider.onRewindSucceeded(mUploadDataStream);
         mHandler.waitForInitComplete();
         mDataProvider.assertRewindNotPending();
         assertEquals(1, mDataProvider.getNumRewindCalls());
         assertEquals(1, mDataProvider.getNumReadCalls());
         assertEquals("", mHandler.getData());
     }
 
     /**
-     * Tests that there is no crash when native CronetUploadDataStreamAdapter is
-     * destroyed while read is pending. The test is racy since read could
-     * complete either before or after onDestroyAdapter() is called in
-     * CronetUploadDataStream. However, the test should pass either way, though
-     * we are interested in the latter case.
+     * Tests that there is no crash when native CronetUploadDataStream is
+     * destroyed while read is pending. The test is racy since the read could
+     * complete either before or after the Java CronetUploadDataStream's
+     * onDestroyUploadDataStream() method is invoked. However, the test should
+     * pass either way, though we are interested in the latter case.
      */
     @SmallTest
     @Feature({"Cronet"})
-    public void testDestroyAdapterBeforeReadComplete()
+    public void testDestroyNativeStreamBeforeReadComplete()
             throws Exception {
         // Start a read and wait for it to be pending.
         assertTrue(mHandler.init());
         mHandler.read();
         mDataProvider.waitForReadRequest();
         mHandler.checkReadCallbackNotInvoked();
 
-        // 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.
+        // Destroy the C++ TestUploadDataStreamHandler. The handler will then
+        // destroy the C++ CronetUploadDataStream it owns on the network thread.
+        // That will result in calling the Java CronetUploadDataSteam's
+        // onCanceled() 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
+     * Tests that there is no crash when native CronetUploadDataStream is
      * destroyed while rewind is pending. The test is racy since rewind could
-     * complete either before or after onDestroyAdapter() is called in
-     * CronetUploadDataStream. However, the test should pass either way, though
-     * we are interested in the latter case.
+     * complete either before or after the Java CronetUploadDataStream's
+     * onDestroyUploadDataStream() method is invoked. However, the test should
+     * pass either way, though we are interested in the latter case.
      */
     @SmallTest
     @Feature({"Cronet"})
-    public void testDestroyAdapterBeforeRewindComplete()
+    public void testDestroyNativeStreamBeforeRewindComplete()
             throws Exception {
         // Start a read and wait for it to complete.
         assertTrue(mHandler.init());
         mHandler.read();
         mDataProvider.waitForReadRequest();
         mHandler.checkReadCallbackNotInvoked();
         mDataProvider.onReadSucceeded(mUploadDataStream);
         mHandler.waitForReadComplete();
         mDataProvider.assertReadNotPending();
         assertEquals(0, mDataProvider.getNumRewindCalls());
         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++ 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.
+        // Destroy the C++ TestUploadDataStreamHandler. The handler will then
+        // destroy the C++ CronetUploadDataStream it owns on the network thread.
+        // That will result in calling the Java CronetUploadDataSteam's
+        // onCanceled() method on its executor thread, which will then destroy
+        // the CronetUploadDataStreamDelegate.
         mHandler.destroyNativeObjects();
 
         // Signal rewind completes, and wait for init to complete.
         mDataProvider.onRewindSucceeded(mUploadDataStream);
 
         assertEquals(1, mDataProvider.getNumRewindCalls());
         assertEquals(1, mDataProvider.getNumReadCalls());
     }
 }