Rename CronetUploadDataStreamAdapter to CronetUploadDataStream.

components/cronet/android/java/src/org/chromium/net/CronetUploadDataStream.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 org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.NativeClassQualifiedName;
 
@@ skipping 98 matching lines @@
                 } catch (Exception exception) {
                     onError(exception);
                 }
             }
         };
         mExecutor.execute(task);
     }
 
     /**
      * Called by native code to destroy the native adapter delegate, when the
      * adapter is destroyed.

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

nit: need to update the comment.

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

Done.

      */
     @SuppressWarnings("unused")
     @CalledByNative
-    void onAdapterDestroyed() {
+    void onUploadDataStreamDestroyed() {
         Runnable task = new Runnable() {
             @Override
             public void run() {
                 destroyDelegate();
             }
         };
 
         mExecutor.execute(task);
     }
 
     /**
      * Helper method called when an exception occurred. This method resets
      * states and propagates the error to the request.
      */
     private void onError(Exception exception) {
         synchronized (mLock) {
             if (!mReading && !mRewinding) {
                 throw new IllegalStateException(
                         "There is no read or rewind in progress.");
             }
             mReading = false;
             mRewinding = false;
             mByteBuffer = null;
             destroyDelegateIfPostponed();
         }
 
         // Just fail the request - simpler to fail directly, and
         // UploadDataStream only supports failing during initialization, not
         // while reading. This should be safe, even if we deleted the adapter,

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

nit: s/"adapter"/"native UploadDataStream" to match the rest of the naming in
this file.

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

Done.

         // because in that case, the request has already been cancelled.
         mRequest.onUploadException(exception);
     }
 
     @Override
     public void onReadSucceeded(boolean lastChunk) {
         synchronized (mLock) {
             if (!mReading) {
                 throw new IllegalStateException("Non-existent read succeeded.");
             }
@@ skipping 96 matching lines @@
      * an interface with just this method, to minimize CronetURLRequest's
      * dependencies on each upload stream type.
      */
     void attachToRequest(CronetUrlRequest request, long requestAdapter) {
         mRequest = request;
         mUploadDataStreamDelegate =
                 nativeAttachUploadDataToRequest(requestAdapter, mLength);
     }
 
     /**
-     * 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.

 
     private native long nativeAttachUploadDataToRequest(long urlRequestAdapter,
             long length);
 
     private native long nativeCreateDelegateForTesting();
 
-    private native long nativeCreateAdapterForTesting(long length,
+    private native long nativeCreateUploadDataStreamForTesting(long length,
             long delegate);
 
     @NativeClassQualifiedName("CronetUploadDataStreamDelegate")
     private native void nativeOnReadSucceeded(long nativePtr,
             int bytesRead, boolean finalChunk);
 
     @NativeClassQualifiedName("CronetUploadDataStreamDelegate")
     private native void nativeOnRewindSucceeded(long nativePtr);
 
     private static native void nativeDestroyDelegate(
             long uploadDataStreamDelegate);
 }