Factor out chunk encoding logic into HttpStreamParser::EncodeChunk().

net/base/upload_data_stream.h

 // Copyright (c) 2011 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.
 
 #ifndef NET_BASE_UPLOAD_DATA_STREAM_H_
 #define NET_BASE_UPLOAD_DATA_STREAM_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_export.h"
@@ skipping 12 matching lines @@
   // initialized successfully. If not, NULL will be returned and the error
   // code will be set if the output parameter error_code is not empty.
   static UploadDataStream* Create(UploadData* data, int* error_code);
 
   // Returns the stream's buffer and buffer length.
   IOBuffer* buf() const { return buf_; }
   size_t buf_len() const { return buf_len_; }
 
   // TODO(satish): We should ideally have UploadDataStream expose a Read()
   // method which returns data in a caller provided IOBuffer. That would do away
   // with this method and make the interface cleaner as well with less memmove

[wtc, 2012/01/18 22:49:24]

method => constant

[satorux1, 2012/01/18 23:42:30]

Good catch. Done.

   // calls.
-  size_t GetMaxBufferSize() const { return kBufSize; }
+  static const size_t kBufferSize;

[wtc, 2012/01/18 22:49:24]

Please document this constant.  (I know this is a pre-existing
problem.)

[satorux1, 2012/01/18 23:42:30]

Done.

 
   // Call to indicate that a portion of the stream's buffer was consumed.  This
   // call modifies the stream's buffer so that it contains the next segment of
   // the upload data to be consumed.
   void MarkConsumedAndFillBuffer(size_t num_bytes);
 
   // Sets the callback to be invoked when new chunks are available to upload.
   void set_chunk_callback(ChunkCallback* callback) {
     data_->set_chunk_callback(callback);
   }
@@ skipping 14 matching lines @@
   // Returns whether the data available in buf() includes the last chunk in a
   // chunked data stream. This method returns true once the final chunk has been
   // placed in the IOBuffer returned by buf(), in contrast to eof() which
   // returns true only after the data in buf() has been consumed.
   bool IsOnLastChunk() const;
 
   // This method is provided only to be used by unit tests.
   static void set_merge_chunks(bool merge) { merge_chunks_ = merge; }
 
  private:
-  enum { kBufSize = 16384 };
-
   // Protects from public access since now we have a static creator function
   // which will do both creation and initialization and might return an error.
   explicit UploadDataStream(UploadData* data);
 
   // Fills the buffer with any remaining data and sets eof_ if there was nothing
   // left to fill the buffer with.
   // Returns OK if the operation succeeds. Otherwise error code is returned.
   int FillBuf();
 
   scoped_refptr<UploadData> data_;
@@ skipping 30 matching lines @@
   // TODO(satish): Remove this once we have a better way to unit test POST
   // requests with chunked uploads.
   static bool merge_chunks_;
 
   DISALLOW_COPY_AND_ASSIGN(UploadDataStream);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_UPLOAD_DATA_STREAM_H_