net/http/http_network_transaction_spdy2_unittest.cc - Issue 11275223: net: Change type of UploadData::elements from std::vector to ScopedVector

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_network_transaction_spdy2_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

« chrome/common/automation_messages.cc ('K') | « net/base/upload_data_stream_unittest.cc ('k') | net/http/http_network_transaction_spdy3_unittest.cc » ('j') | webkit/glue/resource_request_body_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_network_transaction_spdy2_unittest.cc

diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc

index bc761f9fd63c3109e015531976748427e035e069..41ff63ac211f0b5cdb7ea4c75e328bd7d5e261c8 100644

--- a/net/http/http_network_transaction_spdy2_unittest.cc

+++ b/net/http/http_network_transaction_spdy2_unittest.cc

@@ -6583,11 +6583,8 @@ TEST_F(HttpNetworkTransactionSpdy2Test, UploadFileSmallerThanLength) {

UploadFileElementReader::ScopedOverridingContentLengthForTests

overriding_content_length(kFakeSize);

- std::vector<UploadElement> elements;

- UploadElement element;

- element.SetToFilePath(temp_file_path);

- elements.push_back(element);

- request.upload_data->SetElements(elements);

+ request.upload_data->AppendFileRange(

+ temp_file_path, 0, kuint64max, base::Time());

MockRead data_reads[] = {

MockRead("HTTP/1.0 200 OK\r\n\r\n"),

@@ -6639,11 +6636,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, UploadUnreadableFile) {

temp_file_content.length()));

ASSERT_TRUE(file_util::MakeFileUnreadable(temp_file));

- std::vector<UploadElement> elements;

- UploadElement element;

- element.SetToFilePath(temp_file);

- elements.push_back(element);

- request.upload_data->SetElements(elements);

+ request.upload_data->AppendFileRange(temp_file, 0, kuint64max, base::Time());

MockRead data_reads[] = {

MockRead("HTTP/1.0 200 OK\r\n\r\n"),

@@ -6694,11 +6687,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, UnreadableUploadFileAfterAuthRestart) {

ASSERT_TRUE(file_util::WriteFile(temp_file, temp_file_contents.c_str(),

temp_file_contents.length()));

- std::vector<UploadElement> elements;

- UploadElement element;

- element.SetToFilePath(temp_file);

- elements.push_back(element);

- request.upload_data->SetElements(elements);

+ request.upload_data->AppendFileRange(temp_file, 0, kuint64max, base::Time());

MockRead data_reads[] = {

MockRead("HTTP/1.1 401 Unauthorized\r\n"),