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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/loader/upload_data_stream_builder_unittest.cc

Issue 18346006: Update OS X to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 months 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
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.cc ('k') | content/browser/renderer_host/compositing_iosurface_layer_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/upload_data_stream_builder_unittest.cc
diff --git a/content/browser/loader/upload_data_stream_builder_unittest.cc b/content/browser/loader/upload_data_stream_builder_unittest.cc
index 816916031a3f870fa9056918e9d95f429e0b74c1..2aa7bb8dcf297daff6e1a9f28d89689d9764c602 100644
--- a/content/browser/loader/upload_data_stream_builder_unittest.cc
+++ b/content/browser/loader/upload_data_stream_builder_unittest.cc
@@ -71,9 +71,8 @@ TEST(UploadDataStreamBuilderTest, CreateUploadDataStreamWithoutBlob) {
kFileOffset, kFileLength, kFileTime);
request_body->set_identifier(kIdentifier);
- scoped_ptr<net::UploadDataStream> upload(
- UploadDataStreamBuilder::Build(
- request_body, NULL, NULL, base::MessageLoopProxy::current().get()));
+ scoped_ptr<net::UploadDataStream> upload(UploadDataStreamBuilder::Build(
+ request_body.get(), NULL, NULL, base::MessageLoopProxy::current().get()));
EXPECT_EQ(kIdentifier, upload->identifier());
ASSERT_EQ(request_body->elements()->size(), upload->element_readers().size());
@@ -144,11 +143,10 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload_element2.expected_modification_time());
scoped_ptr<net::UploadDataStream> upload(
- UploadDataStreamBuilder::Build(
- request_body,
- &blob_storage_controller,
- NULL,
- base::MessageLoopProxy::current().get()));
+ UploadDataStreamBuilder::Build(request_body.get(),
+ &blob_storage_controller,
+ NULL,
+ base::MessageLoopProxy::current().get()));
ASSERT_EQ(2U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
@@ -158,22 +156,22 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
request_body = new ResourceRequestBody();
request_body->AppendBlob(blob_url0);
- upload = UploadDataStreamBuilder::Build(
- request_body,
- &blob_storage_controller,
- NULL,
- base::MessageLoopProxy::current().get());
+ upload =
+ UploadDataStreamBuilder::Build(request_body.get(),
+ &blob_storage_controller,
+ NULL,
+ base::MessageLoopProxy::current().get());
ASSERT_EQ(0U, upload->element_readers().size());
// Test having only one blob reference.
request_body = new ResourceRequestBody();
request_body->AppendBlob(blob_url1);
- upload = UploadDataStreamBuilder::Build(
- request_body,
- &blob_storage_controller,
- NULL,
- base::MessageLoopProxy::current().get());
+ upload =
+ UploadDataStreamBuilder::Build(request_body.get(),
+ &blob_storage_controller,
+ NULL,
+ base::MessageLoopProxy::current().get());
ASSERT_EQ(2U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
@@ -187,11 +185,11 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload_element2.length(),
upload_element2.expected_modification_time());
- upload = UploadDataStreamBuilder::Build(
- request_body,
- &blob_storage_controller,
- NULL,
- base::MessageLoopProxy::current().get());
+ upload =
+ UploadDataStreamBuilder::Build(request_body.get(),
+ &blob_storage_controller,
+ NULL,
+ base::MessageLoopProxy::current().get());
ASSERT_EQ(4U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
@@ -207,11 +205,11 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload_element2.expected_modification_time());
request_body->AppendBlob(blob_url1);
- upload = UploadDataStreamBuilder::Build(
- request_body,
- &blob_storage_controller,
- NULL,
- base::MessageLoopProxy::current().get());
+ upload =
+ UploadDataStreamBuilder::Build(request_body.get(),
+ &blob_storage_controller,
+ NULL,
+ base::MessageLoopProxy::current().get());
ASSERT_EQ(4U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], upload_element2));
@@ -227,11 +225,11 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload_element2.length(),
upload_element2.expected_modification_time());
- upload = UploadDataStreamBuilder::Build(
- request_body,
- &blob_storage_controller,
- NULL,
- base::MessageLoopProxy::current().get());
+ upload =
+ UploadDataStreamBuilder::Build(request_body.get(),
+ &blob_storage_controller,
+ NULL,
+ base::MessageLoopProxy::current().get());
ASSERT_EQ(4U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element1));
@@ -249,11 +247,11 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload_element2.length(),
upload_element2.expected_modification_time());
- upload = UploadDataStreamBuilder::Build(
- request_body,
- &blob_storage_controller,
- NULL,
- base::MessageLoopProxy::current().get());
+ upload =
+ UploadDataStreamBuilder::Build(request_body.get(),
+ &blob_storage_controller,
+ NULL,
+ base::MessageLoopProxy::current().get());
ASSERT_EQ(8U, upload->element_readers().size());
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.cc ('k') | content/browser/renderer_host/compositing_iosurface_layer_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698