Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1044)

Unified Diff: net/base/upload_data_stream_unittest.cc

Issue 11275223: net: Change type of UploadData::elements from std::vector to ScopedVector (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: _ Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/upload_data_stream_unittest.cc
diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc
index 3c77804996cd044b4c776d239880c1fe02d481e8..afd1fb53e021213664a1e8527228197113a83e78 100644
--- a/net/base/upload_data_stream_unittest.cc
+++ b/net/base/upload_data_stream_unittest.cc
@@ -177,11 +177,7 @@ TEST_F(UploadDataStreamTest, File) {
ASSERT_EQ(static_cast<int>(kTestDataSize),
file_util::WriteFile(temp_file_path, kTestData, kTestDataSize));
- std::vector<UploadElement> elements;
- UploadElement element;
- element.SetToFilePath(temp_file_path);
- elements.push_back(element);
- upload_data_->SetElements(elements);
+ upload_data_->AppendFileRange(temp_file_path, 0, kuint64max, base::Time());
UploadDataStream stream(upload_data_);
ASSERT_EQ(OK, stream.InitSync());
@@ -209,11 +205,7 @@ TEST_F(UploadDataStreamTest, FileSmallerThanLength) {
UploadFileElementReader::ScopedOverridingContentLengthForTests
overriding_content_length(kFakeSize);
- std::vector<UploadElement> elements;
- UploadElement element;
- element.SetToFilePath(temp_file_path);
- elements.push_back(element);
- upload_data_->SetElements(elements);
+ upload_data_->AppendFileRange(temp_file_path, 0, kuint64max, base::Time());
UploadDataStream stream(upload_data_);
ASSERT_EQ(OK, stream.InitSync());
@@ -442,14 +434,10 @@ TEST_F(UploadDataStreamTest, ReadAsync) {
void UploadDataStreamTest::FileChangedHelper(const FilePath& file_path,
const base::Time& time,
bool error_expected) {
- std::vector<UploadElement> elements;
- UploadElement element;
- element.SetToFilePathRange(file_path, 1, 2, time);
- elements.push_back(element);
// Don't use upload_data_ here, as this function is called twice, and
// reusing upload_data_ is wrong.
scoped_refptr<UploadData> upload_data(new UploadData);
- upload_data->SetElements(elements);
+ upload_data->AppendFileRange(file_path, 1, 2, time);
UploadDataStream stream(upload_data);
int error_code = stream.InitSync();
@@ -486,11 +474,7 @@ TEST_F(UploadDataStreamTest, UploadDataReused) {
file_util::WriteFile(temp_file_path, kTestData, kTestDataSize));
// Prepare |upload_data_| that contains a file.
- std::vector<UploadElement> elements;
- UploadElement element;
- element.SetToFilePath(temp_file_path);
- elements.push_back(element);
- upload_data_->SetElements(elements);
+ upload_data_->AppendFileRange(temp_file_path, 0, kuint64max, base::Time());
// Confirm that the file is read properly.
{

Powered by Google App Engine
This is Rietveld 408576698