Convert Pass()→std::move() for Mac build.

chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
 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.
   DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
 }
 
 void SafePicasaAlbumTableReader::Start(const ParserCallback& callback) {
   DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
   DCHECK(!callback.is_null());
 
@@ skipping 44 matching lines @@
 void SafePicasaAlbumTableReader::OnProcessStarted() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (parser_state_ != PINGED_UTILITY_PROCESS_STATE)
     return;
 
   if (utility_process_host_->GetData().handle == base::kNullProcessHandle) {
     DLOG(ERROR) << "Child process handle is null";
   }
   AlbumTableFilesForTransit files_for_transit;
   files_for_transit.indicator_file = IPC::TakeFileHandleForProcess(
-      album_table_files_.indicator_file.Pass(),
+      std::move(album_table_files_.indicator_file),
       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(),
-      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;
 }
 
 void SafePicasaAlbumTableReader::OnParsePicasaPMPDatabaseFinished(
     bool parse_success,
     const std::vector<AlbumInfo>& albums,
     const std::vector<AlbumInfo>& folders) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 19 matching lines @@
     IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ProcessStarted,
                         OnProcessStarted)
     IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParsePicasaPMPDatabase_Finished,
                         OnParsePicasaPMPDatabaseFinished)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 }  // namespace picasa