diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 08:59:16 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 08:59:16 +0000 |
| commit | 49ed6cc5209c5fb18cf1286174b80d52f67f563e (patch) | |
| tree | 5e2c884ec2c40a038b648a80d0b08e850a690edf /net/http/http_stream_parser_unittest.cc | |
| parent | b5088d08be50175ac759d868de91da16a634a323 (diff) | |
| download | chromium_src-49ed6cc5209c5fb18cf1286174b80d52f67f563e.zip chromium_src-49ed6cc5209c5fb18cf1286174b80d52f67f563e.tar.gz chromium_src-49ed6cc5209c5fb18cf1286174b80d52f67f563e.tar.bz2 | |
net: Replace UploadDataStream::Create() with Init().
This is in preparation of adding asynchronous API to UploadDataStream.
Doing initialization in Init() is cleaner anyway.
BUG=72001
TEST=try bots
Review URL: http://codereview.chromium.org/9235079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_stream_parser_unittest.cc')
| -rw-r--r-- | net/http/http_stream_parser_unittest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc index 808a3e3..7f9df56 100644 --- a/net/http/http_stream_parser_unittest.cc +++ b/net/http/http_stream_parser_unittest.cc @@ -87,8 +87,8 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_NoBody) { TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_EmptyBody) { scoped_refptr<UploadData> upload_data = new UploadData; - scoped_ptr<UploadDataStream> body( - UploadDataStream::Create(upload_data.get(), NULL)); + scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data)); + ASSERT_EQ(OK, body->Init()); // Shouldn't be merged if upload data is empty. ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody( "some header", body.get())); @@ -100,8 +100,8 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_ChunkedBody) { const std::string payload = "123"; upload_data->AppendChunk(payload.data(), payload.size(), true); - scoped_ptr<UploadDataStream> body( - UploadDataStream::Create(upload_data.get(), NULL)); + scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data)); + ASSERT_EQ(OK, body->Init()); // Shouldn't be merged if upload data carries chunked data. ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody( "some header", body.get())); @@ -119,8 +119,8 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_FileBody) { upload_data->AppendFileRange(temp_file_path, 0, 0, base::Time()); - scoped_ptr<UploadDataStream> body( - UploadDataStream::Create(upload_data.get(), NULL)); + scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data)); + ASSERT_EQ(OK, body->Init()); // Shouldn't be merged if upload data carries a file, as it's not in-memory. ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody( "some header", body.get())); @@ -131,8 +131,8 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_SmallBodyInMemory) { const std::string payload = "123"; upload_data->AppendBytes(payload.data(), payload.size()); - scoped_ptr<UploadDataStream> body( - UploadDataStream::Create(upload_data.get(), NULL)); + scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data)); + ASSERT_EQ(OK, body->Init()); // Yes, should be merged if the in-memory body is small here. ASSERT_TRUE(HttpStreamParser::ShouldMergeRequestHeadersAndBody( "some header", body.get())); @@ -143,8 +143,8 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_LargeBodyInMemory) { const std::string payload(10000, 'a'); // 'a' x 10000. upload_data->AppendBytes(payload.data(), payload.size()); - scoped_ptr<UploadDataStream> body( - UploadDataStream::Create(upload_data.get(), NULL)); + scoped_ptr<UploadDataStream> body(new UploadDataStream(upload_data)); + ASSERT_EQ(OK, body->Init()); // Shouldn't be merged if the in-memory body is large here. ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody( "some header", body.get())); |