Rename CronetUploadDataStreamAdapter to CronetUploadDataStream.

components/cronet/android/java/src/org/chromium/net/CronetUploadDataStream.java

Index: components/cronet/android/java/src/org/chromium/net/CronetUploadDataStream.java
diff --git a/components/cronet/android/java/src/org/chromium/net/CronetUploadDataStream.java b/components/cronet/android/java/src/org/chromium/net/CronetUploadDataStream.java
index 0427c40d9b683e7da4e448a601ac1901ef3ca809..4c2d3c8ff20552b9c58be15b6346931acbba2c15 100644
--- a/components/cronet/android/java/src/org/chromium/net/CronetUploadDataStream.java
+++ b/components/cronet/android/java/src/org/chromium/net/CronetUploadDataStream.java
@@ -120,7 +120,7 @@ final class CronetUploadDataStream implements UploadDataSink {
      */
     @SuppressWarnings("unused")
     @CalledByNative
-    void onAdapterDestroyed() {
+    void onUploadDataStreamDestroyed() {
         Runnable task = new Runnable() {
             @Override
             public void run() {
@@ -266,13 +266,14 @@ final class CronetUploadDataStream implements UploadDataSink {
     }
 
     /**
-     * Creates a native UploadDataStreamDelegate and UploadDataStreamAdapter
-     * for testing.
-     * @return the address of the native CronetUploadDataStreamAdapter object.
+     * Creates a native CronetUploadDataStreamDelegate and
+     * CronetUploadDataStream for testing.
+     * @return the address of the native CronetUploadDataStream object.
      */
-    public long createAdapterForTesting() {
+    public long createUploadDataStreamForTesting() {
         mUploadDataStreamDelegate = nativeCreateDelegateForTesting();
-        return nativeCreateAdapterForTesting(mLength, mUploadDataStreamDelegate);
+        return nativeCreateUploadDataStreamForTesting(mLength,
+                mUploadDataStreamDelegate);
     }
 
     // Native methods are implemented in upload_data_stream_adapter.cc.

[xunjieli, 2015/05/08 20:11:27]

nit: need to update file name here.

[mmenke, 2015/05/08 20:24:18]

Done.

@@ -282,7 +283,7 @@ final class CronetUploadDataStream implements UploadDataSink {
 
     private native long nativeCreateDelegateForTesting();
 
-    private native long nativeCreateAdapterForTesting(long length,
+    private native long nativeCreateUploadDataStreamForTesting(long length,
             long delegate);
 
     @NativeClassQualifiedName("CronetUploadDataStreamDelegate")