Convert Pass()→std::move() in //components/[n-z]*

components/storage_monitor/storage_monitor_linux.cc

 // Copyright 2014 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.
 
 // StorageMonitorLinux implementation.
 
 #include "components/storage_monitor/storage_monitor_linux.h"
 
 #include <mntent.h>
 #include <stdint.h>
 #include <stdio.h>
-
 #include <limits>
 #include <list>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/process/process.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 99 matching lines @@
                                       const base::FilePath& mount_point) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   DCHECK(!device_path.empty());
 
   scoped_ptr<StorageInfo> storage_info;
 
   ScopedGetDeviceInfoResultRecorder results_recorder;
 
   device::ScopedUdevPtr udev_obj(device::udev_new());
   if (!udev_obj.get())
-    return storage_info.Pass();
+    return storage_info;
 
   struct stat device_stat;
   if (stat(device_path.value().c_str(), &device_stat) < 0)
-    return storage_info.Pass();
+    return storage_info;
 
   char device_type;
   if (S_ISCHR(device_stat.st_mode))
     device_type = 'c';
   else if (S_ISBLK(device_stat.st_mode))
     device_type = 'b';
   else
-    return storage_info.Pass();  // Not a supported type.
+    return storage_info;  // Not a supported type.
 
   device::ScopedUdevDevicePtr device(
       device::udev_device_new_from_devnum(udev_obj.get(), device_type,
                                           device_stat.st_rdev));
   if (!device.get())
-    return storage_info.Pass();
+    return storage_info;
 
   base::string16 volume_label = base::UTF8ToUTF16(
       device::UdevDeviceGetPropertyValue(device.get(), kLabel));
   base::string16 vendor_name = base::UTF8ToUTF16(
       device::UdevDeviceGetPropertyValue(device.get(), kVendor));
   base::string16 model_name = base::UTF8ToUTF16(
       device::UdevDeviceGetPropertyValue(device.get(), kModel));
 
   std::string unique_id = MakeDeviceUniqueId(device.get());
 
@@ skipping 25 matching lines @@
 
   results_recorder.set_result(true);
 
   storage_info.reset(new StorageInfo(
       StorageInfo::MakeDeviceId(type, unique_id),
       mount_point.value(),
       volume_label,
       vendor_name,
       model_name,
       GetDeviceStorageSize(device_path, device.get())));
-  return storage_info.Pass();
+  return storage_info;
 }
 
 MtabWatcherLinux* CreateMtabWatcherLinuxOnFileThread(
     const base::FilePath& mtab_path,
     base::WeakPtr<MtabWatcherLinux::Delegate> delegate) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   // Owned by caller.
   return new MtabWatcherLinux(mtab_path, delegate);
 }
 
@@ skipping 10 matching lines @@
 
   base::LaunchOptions options;
   base::Process process = base::LaunchProcess(command, options);
   if (!process.IsValid())
     return StorageMonitor::EJECT_FAILURE;
 
   int exit_code = -1;
   if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000),
                                       &exit_code)) {
     process.Terminate(-1, false);
-    base::EnsureProcessTerminated(process.Pass());
+    base::EnsureProcessTerminated(std::move(process));
     return StorageMonitor::EJECT_FAILURE;
   }
 
   // TODO(gbillock): Make sure this is found in documentation
   // somewhere. Experimentally it seems to hold that exit code
   // 1 means device is in use.
   if (exit_code == 1)
     return StorageMonitor::EJECT_IN_USE;
   if (exit_code != 0)
     return StorageMonitor::EJECT_FAILURE;
@@ skipping 263 matching lines @@
   mount_priority_map_[mount_device][mount_point] = removable;
   receiver()->ProcessAttach(*storage_info);
 }
 
 StorageMonitor* StorageMonitor::CreateInternal() {
   const base::FilePath kDefaultMtabPath("/etc/mtab");
   return new StorageMonitorLinux(kDefaultMtabPath);
 }
 
 }  // namespace storage_monitor