diff options
| author | dcheng <dcheng@chromium.org> | 2014-10-16 18:53:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-17 01:53:34 +0000 |
| commit | 1f8f29add4c79ca10621a52067979cb8215783d0 (patch) | |
| tree | d5c8155383bef563b542f26bd46ed5ce525578cb /storage | |
| parent | 823a646501c4d8c28719ec25ea80cafc047f40d7 (diff) | |
| download | chromium_src-1f8f29add4c79ca10621a52067979cb8215783d0.zip chromium_src-1f8f29add4c79ca10621a52067979cb8215783d0.tar.gz chromium_src-1f8f29add4c79ca10621a52067979cb8215783d0.tar.bz2 | |
Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.
BUG=423621
Review URL: https://codereview.chromium.org/660653006
Cr-Commit-Position: refs/heads/master@{#300040}
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/browser/fileapi/local_file_util.cc | 9 | ||||
| -rw-r--r-- | storage/browser/fileapi/native_file_util.cc | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/storage/browser/fileapi/local_file_util.cc b/storage/browser/fileapi/local_file_util.cc index 81bd865..5f3be4f 100644 --- a/storage/browser/fileapi/local_file_util.cc +++ b/storage/browser/fileapi/local_file_util.cc @@ -139,13 +139,12 @@ scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> LocalFileUtil:: base::FilePath file_path; if (GetLocalFilePath(context, root_url, &file_path) != base::File::FILE_OK) { - return make_scoped_ptr(new EmptyFileEnumerator) - .PassAs<FileSystemFileUtil::AbstractFileEnumerator>(); + return make_scoped_ptr(new EmptyFileEnumerator); } return make_scoped_ptr(new LocalFileEnumerator( - file_path, root_url.path(), - base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES)) - .PassAs<FileSystemFileUtil::AbstractFileEnumerator>(); + file_path, + root_url.path(), + base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES)); } base::File::Error LocalFileUtil::GetLocalFilePath( diff --git a/storage/browser/fileapi/native_file_util.cc b/storage/browser/fileapi/native_file_util.cc index b1ffd3d..84b9463 100644 --- a/storage/browser/fileapi/native_file_util.cc +++ b/storage/browser/fileapi/native_file_util.cc @@ -206,9 +206,9 @@ scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> NativeFileUtil::CreateFileEnumerator(const base::FilePath& root_path, bool recursive) { return make_scoped_ptr(new NativeFileEnumerator( - root_path, recursive, - base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES)) - .PassAs<FileSystemFileUtil::AbstractFileEnumerator>(); + root_path, + recursive, + base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES)); } base::File::Error NativeFileUtil::Touch( |