net: Fix a regression that broke file uploading with http authentication

net/base/upload_data_stream_unittest.cc

 // 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.
 
 #include "net/base/upload_data_stream.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/upload_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace net {
 
 namespace {
 
 const char kTestData[] = "0123456789";
 const size_t kTestDataSize = arraysize(kTestData) - 1;
 const size_t kTestBufferSize = 1 << 14;  // 16KB.
 
+// Reads data from the upload data stream, and returns the data as string.
+std::string ReadFromUploadDataStream(UploadDataStream* stream) {
+  std::string data_read;
+  scoped_refptr<IOBuffer> buf = new IOBuffer(kTestBufferSize);
+  while (!stream->IsEOF()) {
+    const int bytes_read = stream->Read(buf, kTestBufferSize);
+    data_read.append(buf->data(), bytes_read);
+  }
+  return data_read;
+}
+
 }  // namespace
 
 class UploadDataStreamTest : public PlatformTest {
  public:
   UploadDataStreamTest() : upload_data_(new UploadData) { }
 
   void FileChangedHelper(const FilePath& file_path,
                          const base::Time& time,
                          bool error_expected);
 
@@ skipping 97 matching lines @@
   FileChangedHelper(temp_file_path, file_info.last_modified, false);
 
   // Test file changed.
   FileChangedHelper(temp_file_path,
                     file_info.last_modified - base::TimeDelta::FromSeconds(1),
                     true);
 
   file_util::Delete(temp_file_path, false);
 }
 
+TEST_F(UploadDataStreamTest, UploadDataReused) {
+  FilePath temp_file_path;
+  ASSERT_TRUE(file_util::CreateTemporaryFile(&temp_file_path));
+  ASSERT_EQ(static_cast<int>(kTestDataSize),
+            file_util::WriteFile(temp_file_path, kTestData, kTestDataSize));
+
+  // Prepare |upload_data_| that contains a file.
+  std::vector<UploadData::Element> elements;
+  UploadData::Element element;
+  element.SetToFilePath(temp_file_path);
+  elements.push_back(element);
+  upload_data_->SetElements(elements);
+  EXPECT_EQ(kTestDataSize, upload_data_->GetContentLengthSync());
+
+  // Confirm that the file is read properly.
+  {
+    scoped_ptr<UploadDataStream> stream(new UploadDataStream(upload_data_));

[willchan no longer on Chromium, 2012/05/21 18:17:35]

Any special reason to use a scoped_ptr here?

[satorux1, 2012/05/21 19:37:00]

Done.

+    ASSERT_EQ(OK, stream->Init());
+    EXPECT_EQ(kTestData, ReadFromUploadDataStream(stream.get()));
+  }
+
+  // Reuse |upload_data_| for another UploadDataStream, and confirm that the
+  // file is read properly.
+  {
+    scoped_ptr<UploadDataStream> stream(new UploadDataStream(upload_data_));

[willchan no longer on Chromium, 2012/05/21 18:17:35]

Ditto

[satorux1, 2012/05/21 19:37:00]

Done.

+    ASSERT_EQ(OK, stream->Init());
+    EXPECT_EQ(kTestData, ReadFromUploadDataStream(stream.get()));
+  }
+
+  file_util::Delete(temp_file_path, false);
+}
+
 }  // namespace net