Rename CronetUploadDataStreamAdapter to CronetUploadDataStream.

components/cronet/android/cronet_upload_data_stream_delegate.h

Index: components/cronet/android/cronet_upload_data_stream_delegate.h
diff --git a/components/cronet/android/cronet_upload_data_stream_delegate.h b/components/cronet/android/cronet_upload_data_stream_delegate.h
index 1c3b9b2285d2e2bb7f796aa784676a1ed3d3c440..b182397ffc3cff4a25c014f986ca71ca35a1d36b 100644
--- a/components/cronet/android/cronet_upload_data_stream_delegate.h
+++ b/components/cronet/android/cronet_upload_data_stream_delegate.h
@@ -11,7 +11,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "components/cronet/android/cronet_upload_data_stream_adapter.h"
+#include "components/cronet/android/cronet_upload_data_stream.h"
 #include "net/base/io_buffer.h"
 
 namespace base {
@@ -26,25 +26,23 @@ namespace cronet {
 //
 // The Delegate is owned by the Java CronetUploadDataStream, and also owns a
 // reference to it. The Delegate is only destroyed after the URLRequest

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

nit: not related to this CL. But could you change "URLRequest" to
"net::URLRequest" to make it clearer that the object is a C++ object and belongs
to the net layer?

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

Done.

-// destroys the adapter and the CronetUploadDataStream has no read operation
-// pending, at which point it also releases its reference to the
-// CronetUploadDataStream.
+// destroys the C++ CronetUploadDataStream and the Java CronetUploadDataStream
+// has no read operation pending, at which point it also releases its reference
+// to the Java CronetUploadDataStream.
 //
 // Failures don't go through the delegate, but directly to the Java request
 // object, since normally reads aren't allowed to fail during an upload.
-class CronetUploadDataStreamDelegate
-    : public CronetUploadDataStreamAdapter::Delegate {
+class CronetUploadDataStreamDelegate : public CronetUploadDataStream::Delegate {
  public:
   CronetUploadDataStreamDelegate(JNIEnv* env, jobject jupload_data_stream);
   ~CronetUploadDataStreamDelegate() override;
 
-  // CronetUploadDataStreamAdapter::Delegate implementation.  Called on network
-  // thread.
+  // CronetUploadDataStream::Delegate implementation.  Called on network thread.
   void InitializeOnNetworkThread(
-      base::WeakPtr<CronetUploadDataStreamAdapter> adapter) override;
+      base::WeakPtr<CronetUploadDataStream> upload_data_stream) override;
   void Read(net::IOBuffer* buffer, int buf_len) override;
   void Rewind() override;
-  void OnAdapterDestroyed() override;
+  void OnUploadDataStreamDestroyed() override;
 
   // Callbacks from Java, called on some Java thread.
   void OnReadSucceeded(JNIEnv* env,
@@ -60,7 +58,7 @@ class CronetUploadDataStreamDelegate
   // These are initialized in InitializeOnNetworkThread, so are safe to access
   // during Java callbacks, which all happen after initialization.
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
-  base::WeakPtr<CronetUploadDataStreamAdapter> adapter_;
+  base::WeakPtr<CronetUploadDataStream> upload_data_stream_;
 
   // Used to keep the read buffer alive until the callback from Java has been
   // received.