| Index: net/base/upload_data_stream.cc
|
| diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc
|
| index c3a2f0bd1dabaf9364b396a8eab401c5cf5c56e2..0da50753381cda34f6f4c023f78d22f87ff713f2 100644
|
| --- a/net/base/upload_data_stream.cc
|
| +++ b/net/base/upload_data_stream.cc
|
| @@ -12,24 +12,6 @@
|
|
|
| namespace net {
|
|
|
| -namespace {
|
| -
|
| -// A subclass of UplodBytesElementReader which owns the data given as a vector.
|
| -class UploadOwnedBytesElementReader : public UploadBytesElementReader {
|
| - public:
|
| - UploadOwnedBytesElementReader(std::vector<char>* data)
|
| - : UploadBytesElementReader(&(*data)[0], data->size()) {
|
| - data_.swap(*data);
|
| - }
|
| -
|
| - virtual ~UploadOwnedBytesElementReader() {}
|
| -
|
| - private:
|
| - std::vector<char> data_;
|
| -};
|
| -
|
| -} // namespace
|
| -
|
| bool UploadDataStream::merge_chunks_ = true;
|
|
|
| // static
|
| @@ -66,6 +48,14 @@ UploadDataStream::UploadDataStream(Chunked /*chunked*/, int64 identifier)
|
| UploadDataStream::~UploadDataStream() {
|
| }
|
|
|
| +UploadDataStream* UploadDataStream::CreateWithReader(
|
| + scoped_ptr<UploadElementReader> reader,
|
| + int64 identifier) {
|
| + ScopedVector<UploadElementReader> readers;
|
| + readers.push_back(reader.release());
|
| + return new UploadDataStream(&readers, identifier);
|
| +}
|
| +
|
| int UploadDataStream::Init(const CompletionCallback& callback) {
|
| Reset();
|
| // Use fast path when initialization can be done synchronously.
|
|
|