diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 23:47:38 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 23:47:38 +0000 |
| commit | ff875be5f3f3db4cdc5bbfe4a014580867c7a044 (patch) | |
| tree | e59c4716dc0b4bd427dd84bfa8e15a16aaf50eab /webkit/common/blob | |
| parent | ed264deb5072425ac355bf4b4cc3d43059ddae94 (diff) | |
| download | chromium_src-ff875be5f3f3db4cdc5bbfe4a014580867c7a044.zip chromium_src-ff875be5f3f3db4cdc5bbfe4a014580867c7a044.tar.gz chromium_src-ff875be5f3f3db4cdc5bbfe4a014580867c7a044.tar.bz2 | |
Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16155009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/common/blob')
| -rw-r--r-- | webkit/common/blob/scoped_file.cc | 4 | ||||
| -rw-r--r-- | webkit/common/blob/shareable_file_reference_unittest.cc | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/webkit/common/blob/scoped_file.cc b/webkit/common/blob/scoped_file.cc index 0198728..df1d3d4 100644 --- a/webkit/common/blob/scoped_file.cc +++ b/webkit/common/blob/scoped_file.cc @@ -63,7 +63,9 @@ void ScopedFile::Reset() { } if (scope_out_policy_ == DELETE_ON_SCOPE_OUT) { - base::FileUtilProxy::Delete(file_task_runner_, path_, false /* recursive */, + base::FileUtilProxy::Delete(file_task_runner_.get(), + path_, + false /* recursive */, base::FileUtilProxy::StatusCallback()); } diff --git a/webkit/common/blob/shareable_file_reference_unittest.cc b/webkit/common/blob/shareable_file_reference_unittest.cc index df81e00..3ee2cd8 100644 --- a/webkit/common/blob/shareable_file_reference_unittest.cc +++ b/webkit/common/blob/shareable_file_reference_unittest.cc @@ -29,7 +29,7 @@ TEST(ShareableFileReferenceTest, TestReferences) { reference1 = ShareableFileReference::Get(file); EXPECT_FALSE(reference1.get()); reference1 = ShareableFileReference::GetOrCreate( - file, ShareableFileReference::DELETE_ON_FINAL_RELEASE, loop_proxy); + file, ShareableFileReference::DELETE_ON_FINAL_RELEASE, loop_proxy.get()); EXPECT_TRUE(reference1.get()); EXPECT_TRUE(file == reference1->path()); @@ -38,7 +38,7 @@ TEST(ShareableFileReferenceTest, TestReferences) { reference2 = ShareableFileReference::Get(file); EXPECT_EQ(reference1.get(), reference2.get()); reference2 = ShareableFileReference::GetOrCreate( - file, ShareableFileReference::DELETE_ON_FINAL_RELEASE, loop_proxy); + file, ShareableFileReference::DELETE_ON_FINAL_RELEASE, loop_proxy.get()); EXPECT_EQ(reference1.get(), reference2.get()); // Drop the first reference, the file and reference should still be there. |