diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:51:50 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:51:50 +0000 |
| commit | e66f0263e6f8333d9310bb595af5b912360a65c3 (patch) | |
| tree | 71667742fc12aab9b840c27a1730f34f5acb456e /webkit/browser/fileapi | |
| parent | ae6ef14fe8d5c5df694efc7e09bcf86e4747d7ad (diff) | |
| download | chromium_src-e66f0263e6f8333d9310bb595af5b912360a65c3.zip chromium_src-e66f0263e6f8333d9310bb595af5b912360a65c3.tar.gz chromium_src-e66f0263e6f8333d9310bb595af5b912360a65c3.tar.bz2 | |
Update OS X to use scoped_refptr<T>::get() rather than implicit "operator T*"
OS X fixes and post-Linux cleanup
BUG=110610
TBR=darin
Review URL: https://codereview.chromium.org/16402003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/browser/fileapi')
| -rw-r--r-- | webkit/browser/fileapi/file_system_task_runners.cc | 6 | ||||
| -rw-r--r-- | webkit/browser/fileapi/obfuscated_file_util_unittest.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webkit/browser/fileapi/file_system_task_runners.cc b/webkit/browser/fileapi/file_system_task_runners.cc index 19d81c5..5543fb8 100644 --- a/webkit/browser/fileapi/file_system_task_runners.cc +++ b/webkit/browser/fileapi/file_system_task_runners.cc @@ -19,9 +19,9 @@ FileSystemTaskRunners::FileSystemTaskRunners( // static scoped_ptr<FileSystemTaskRunners> FileSystemTaskRunners::CreateMockTaskRunners() { - return make_scoped_ptr(new FileSystemTaskRunners( - base::MessageLoopProxy::current(), - base::MessageLoopProxy::current())); + return make_scoped_ptr( + new FileSystemTaskRunners(base::MessageLoopProxy::current().get(), + base::MessageLoopProxy::current().get())); } FileSystemTaskRunners::~FileSystemTaskRunners() { diff --git a/webkit/browser/fileapi/obfuscated_file_util_unittest.cc b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc index 46ea96e..22adfd5 100644 --- a/webkit/browser/fileapi/obfuscated_file_util_unittest.cc +++ b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc @@ -2260,7 +2260,7 @@ TEST_F(ObfuscatedFileUtilTest, TestQuotaOnOpen) { TEST_F(ObfuscatedFileUtilTest, MaybeDropDatabasesAliveCase) { ObfuscatedFileUtil file_util(NULL, data_dir_path(), - base::MessageLoopProxy::current()); + base::MessageLoopProxy::current().get()); file_util.InitOriginDatabase(true /*create*/); ASSERT_TRUE(file_util.origin_database_ != NULL); @@ -2278,7 +2278,7 @@ TEST_F(ObfuscatedFileUtilTest, MaybeDropDatabasesAlreadyDeletedCase) { { ObfuscatedFileUtil file_util(NULL, data_dir_path(), - base::MessageLoopProxy::current()); + base::MessageLoopProxy::current().get()); file_util.InitOriginDatabase(true /*create*/); file_util.db_flush_delay_seconds_ = 0; file_util.MarkUsed(); |