diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 16:46:36 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 16:46:36 +0000 |
commit | cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622 (patch) | |
tree | 7b95f103fce509de887c8c5e643604855b57c0ba /webkit/glue | |
parent | 9f6e673c7f43f6ee414f72a74585dad8ebaceec3 (diff) | |
download | chromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.zip chromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.tar.gz chromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.tar.bz2 |
Call scoped_refptr<T>::get() rather than relying on implicit "operator T*"
This upates calls to bound temporary objects to also use get().
While it has the same semantic equivalence to the existing code, this generally
represents a dangerous pattern - indeed, part of the whole motivation for this
change is to make this anti-pattern very visible to authors.
This change simply updates all of the call sites, to allow the "operator T*"
to be removed and preventing new instances. The existing instances will then be
reviewed for "suspicious" changes and updated to use/pass scoped_refptr<T>
rather than T*, as appropriate.
BUG=110610
TBR=darin
Review URL: https://codereview.chromium.org/15984016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r-- | webkit/glue/resource_request_body_unittest.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/webkit/glue/resource_request_body_unittest.cc b/webkit/glue/resource_request_body_unittest.cc index 3c107fa..523b7dc 100644 --- a/webkit/glue/resource_request_body_unittest.cc +++ b/webkit/glue/resource_request_body_unittest.cc @@ -72,7 +72,7 @@ TEST(ResourceRequestBodyTest, CreateUploadDataStreamWithoutBlob) { scoped_ptr<net::UploadDataStream> upload( request_body->ResolveElementsAndCreateUploadDataStream( - NULL, NULL, base::MessageLoopProxy::current())); + NULL, NULL, base::MessageLoopProxy::current().get())); EXPECT_EQ(kIdentifier, upload->identifier()); ASSERT_EQ(request_body->elements()->size(), upload->element_readers().size()); @@ -144,7 +144,9 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) { scoped_ptr<net::UploadDataStream> upload( request_body->ResolveElementsAndCreateUploadDataStream( - &blob_storage_controller, NULL, base::MessageLoopProxy::current())); + &blob_storage_controller, + NULL, + base::MessageLoopProxy::current().get())); ASSERT_EQ(2U, upload->element_readers().size()); EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1)); @@ -155,7 +157,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) { request_body->AppendBlob(blob_url0); upload.reset(request_body->ResolveElementsAndCreateUploadDataStream( - &blob_storage_controller, NULL, base::MessageLoopProxy::current())); + &blob_storage_controller, NULL, base::MessageLoopProxy::current().get())); ASSERT_EQ(0U, upload->element_readers().size()); // Test having only one blob reference. @@ -163,7 +165,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) { request_body->AppendBlob(blob_url1); upload.reset(request_body->ResolveElementsAndCreateUploadDataStream( - &blob_storage_controller, NULL, base::MessageLoopProxy::current())); + &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)); @@ -178,7 +180,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) { upload_element2.expected_modification_time()); upload.reset(request_body->ResolveElementsAndCreateUploadDataStream( - &blob_storage_controller, NULL, base::MessageLoopProxy::current())); + &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)); @@ -195,7 +197,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) { request_body->AppendBlob(blob_url1); upload.reset(request_body->ResolveElementsAndCreateUploadDataStream( - &blob_storage_controller, NULL, base::MessageLoopProxy::current())); + &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)); @@ -212,7 +214,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) { upload_element2.expected_modification_time()); upload.reset(request_body->ResolveElementsAndCreateUploadDataStream( - &blob_storage_controller, NULL, base::MessageLoopProxy::current())); + &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)); @@ -231,7 +233,7 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) { upload_element2.expected_modification_time()); upload.reset(request_body->ResolveElementsAndCreateUploadDataStream( - &blob_storage_controller, NULL, base::MessageLoopProxy::current())); + &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)); |