Index: chrome/browser/file_select_helper.cc |
diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc |
index 72f121ba9addd4291dac5fe63e0abff9b22ffb59..ff1b94356d6031225ddd499ef98777c15a6d9ccf 100644 |
--- a/chrome/browser/file_select_helper.cc |
+++ b/chrome/browser/file_select_helper.cc |
@@ -321,7 +321,7 @@ FileSelectHelper::GetFileTypesFromAcceptType( |
scoped_ptr<ui::SelectFileDialog::FileTypeInfo> base_file_type( |
new ui::SelectFileDialog::FileTypeInfo()); |
if (accept_types.empty()) |
- return base_file_type.Pass(); |
+ return base_file_type; |
// Create FileTypeInfo and pre-allocate for the first extension list. |
scoped_ptr<ui::SelectFileDialog::FileTypeInfo> file_type( |
@@ -362,7 +362,7 @@ FileSelectHelper::GetFileTypesFromAcceptType( |
// If no valid extension is added, bail out. |
if (valid_type_count == 0) |
- return base_file_type.Pass(); |
+ return base_file_type; |
// Use a generic description "Custom Files" if either of the following is |
// true: |
@@ -380,7 +380,7 @@ FileSelectHelper::GetFileTypesFromAcceptType( |
l10n_util::GetStringUTF16(description_id)); |
} |
- return file_type.Pass(); |
+ return file_type; |
} |
// static |
@@ -470,7 +470,7 @@ void FileSelectHelper::GetSanitizedFilenameOnUIThread( |
} |
#endif |
- RunFileChooserOnUIThread(default_file_path, params.Pass()); |
+ RunFileChooserOnUIThread(default_file_path, std::move(params)); |
} |
#if defined(FULL_SAFE_BROWSING) |
@@ -484,7 +484,7 @@ void FileSelectHelper::ApplyUnverifiedDownloadPolicy( |
return; |
} |
- RunFileChooserOnUIThread(default_path, params.Pass()); |
+ RunFileChooserOnUIThread(default_path, std::move(params)); |
} |
#endif |