net: Return size of upload as well as position from HttpTransaction::GetUploadProgress()

net/http/http_stream.h

 // Copyright (c) 2012 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.
 //
 // HttpStream is an interface for reading and writing data to an HttpStream that
 // keeps the client agnostic of the actual underlying transport layer.  This
 // provides an abstraction for both a basic http stream as well as http
 // pipelining implementations.  The HttpStream subtype is expected to manage the
 // underlying transport appropriately.  For example, a non-pipelined HttpStream
 // would return the transport socket to the pool for reuse.  SPDY streams on the
 // other hand leave the transport socket management to the SpdySession.
 
 #ifndef NET_HTTP_HTTP_STREAM_H_
 #define NET_HTTP_HTTP_STREAM_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
+#include "net/base/upload_progress.h"
 
 namespace net {
 
 class BoundNetLog;
 class HttpNetworkSession;
 class HttpRequestHeaders;
 struct HttpRequestInfo;
 class HttpResponseInfo;
 class IOBuffer;
 class SSLCertRequestInfo;
@@ skipping 14 matching lines @@
   // Writes the headers and uploads body data to the underlying socket.
   // ERR_IO_PENDING is returned if the operation could not be completed
   // synchronously, in which case the result will be passed to the callback
   // when available. Returns OK on success.
   virtual int SendRequest(const HttpRequestHeaders& request_headers,
                           scoped_ptr<UploadDataStream> request_body,
                           HttpResponseInfo* response,
                           const CompletionCallback& callback) = 0;
 
   // Queries the UploadDataStream for its progress (bytes sent).
-  virtual uint64 GetUploadProgress() const = 0;
+  virtual UploadProgress GetUploadProgress() const = 0;
 
   // Reads from the underlying socket until the response headers have been
   // completely received. ERR_IO_PENDING is returned if the operation could
   // not be completed synchronously, in which case the result will be passed
   // to the callback when available. Returns OK on success.  The response
   // headers are available in the HttpResponseInfo returned by GetResponseInfo
   virtual int ReadResponseHeaders(const CompletionCallback& callback) = 0;
 
   // Provides access to HttpResponseInfo (owned by HttpStream).
   virtual const HttpResponseInfo* GetResponseInfo() const = 0;
@@ skipping 78 matching lines @@
   // draining is complete.
   virtual void Drain(HttpNetworkSession* session) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpStream);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_H_