| Index: chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.cc b/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.cc
|
| index e5aaadc939a4fe88e60e526bea936975249533cd..ee68daee933fb5e9c7a41ed242deaf6b7a938c7d 100644
|
| --- a/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
|
| @@ -20,7 +22,7 @@ namespace picasa {
|
|
|
| SafePicasaAlbumTableReader::SafePicasaAlbumTableReader(
|
| AlbumTableFiles album_table_files)
|
| - : album_table_files_(album_table_files.Pass()),
|
| + : album_table_files_(std::move(album_table_files)),
|
| parser_state_(INITIAL_STATE) {
|
| // TODO(tommycli): Add DCHECK to make sure |album_table_files| are all
|
| // opened read-only once security adds ability to check PlatformFiles.
|
| @@ -85,26 +87,26 @@ void SafePicasaAlbumTableReader::OnProcessStarted() {
|
| }
|
| AlbumTableFilesForTransit files_for_transit;
|
| files_for_transit.indicator_file = IPC::TakeFileHandleForProcess(
|
| - album_table_files_.indicator_file.Pass(),
|
| - utility_process_host_->GetData().handle);
|
| - files_for_transit.category_file = IPC::TakeFileHandleForProcess(
|
| - album_table_files_.category_file.Pass(),
|
| - utility_process_host_->GetData().handle);
|
| - files_for_transit.date_file = IPC::TakeFileHandleForProcess(
|
| - album_table_files_.date_file.Pass(),
|
| - utility_process_host_->GetData().handle);
|
| - files_for_transit.filename_file = IPC::TakeFileHandleForProcess(
|
| - album_table_files_.filename_file.Pass(),
|
| - utility_process_host_->GetData().handle);
|
| - files_for_transit.name_file = IPC::TakeFileHandleForProcess(
|
| - album_table_files_.name_file.Pass(),
|
| - utility_process_host_->GetData().handle);
|
| - files_for_transit.token_file = IPC::TakeFileHandleForProcess(
|
| - album_table_files_.token_file.Pass(),
|
| - utility_process_host_->GetData().handle);
|
| - files_for_transit.uid_file = IPC::TakeFileHandleForProcess(
|
| - album_table_files_.uid_file.Pass(),
|
| + std::move(album_table_files_.indicator_file),
|
| utility_process_host_->GetData().handle);
|
| + files_for_transit.category_file =
|
| + IPC::TakeFileHandleForProcess(std::move(album_table_files_.category_file),
|
| + utility_process_host_->GetData().handle);
|
| + files_for_transit.date_file =
|
| + IPC::TakeFileHandleForProcess(std::move(album_table_files_.date_file),
|
| + utility_process_host_->GetData().handle);
|
| + files_for_transit.filename_file =
|
| + IPC::TakeFileHandleForProcess(std::move(album_table_files_.filename_file),
|
| + utility_process_host_->GetData().handle);
|
| + files_for_transit.name_file =
|
| + IPC::TakeFileHandleForProcess(std::move(album_table_files_.name_file),
|
| + utility_process_host_->GetData().handle);
|
| + files_for_transit.token_file =
|
| + IPC::TakeFileHandleForProcess(std::move(album_table_files_.token_file),
|
| + utility_process_host_->GetData().handle);
|
| + files_for_transit.uid_file =
|
| + IPC::TakeFileHandleForProcess(std::move(album_table_files_.uid_file),
|
| + utility_process_host_->GetData().handle);
|
| utility_process_host_->Send(new ChromeUtilityMsg_ParsePicasaPMPDatabase(
|
| files_for_transit));
|
| parser_state_ = STARTED_PARSING_STATE;
|
|
|