Remove task.h and finish base::Bind() migration.

chrome/browser/chromeos/disks/disk_mount_manager.cc

 // Copyright (c) 2011 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/chromeos/disks/disk_mount_manager.h"
 
 #include <map>
 #include <set>
 
 #include <sys/statvfs.h>
 
 #include "base/bind.h"
+#include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 namespace disks {
 
@@ skipping 42 matching lines @@
         OnMountCompleted(MOUNT_ERROR_INTERNAL, source_path, type, "");
         return;
       }
     }
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     cros_disks_client_->Mount(
         source_path,
         type,
         // When succeeds, OnMountCompleted will be called by
         // "MountCompleted" signal instead.
-        base::Bind(&DoNothing),
+        base::Bind(&base::DoNothing),
         base::Bind(&DiskMountManagerImpl::OnMountCompleted,
                    weak_ptr_factory_.GetWeakPtr(),
                    MOUNT_ERROR_INTERNAL,
                    source_path,
                    type,
                    ""));
   }
 
   // DiskMountManager override.
   virtual void UnmountPath(const std::string& mount_path) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     cros_disks_client_->Unmount(mount_path,
                                 base::Bind(&DiskMountManagerImpl::OnUnmountPath,
                                            weak_ptr_factory_.GetWeakPtr()),
-                                base::Bind(&DoNothing));
+                                base::Bind(&base::DoNothing));
   }
 
   // DiskMountManager override.
   virtual void GetSizeStatsOnFileThread(const std::string& mount_path,
                                         size_t* total_size_kb,
                                         size_t* remaining_size_kb) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
     uint64_t total_size_in_bytes = 0;
     uint64_t remaining_size_in_bytes = 0;
@@ skipping 111 matching lines @@
       callback(user_data, false);
     }
   }
 
   // DiskMountManager override.
   virtual void RequestMountInfoRefresh() OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     cros_disks_client_->EnumerateAutoMountableDevices(
         base::Bind(&DiskMountManagerImpl::OnRequestMountInfo,
                    weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(&DoNothing));
+        base::Bind(&base::DoNothing));
   }
 
   // DiskMountManager override.
   const DiskMap& disks() const OVERRIDE { return disks_; }
 
 
   // DiskMountManager override.
   const MountPointMap& mount_points() const OVERRIDE { return mount_points_; }
 
  private:
@@ skipping 155 matching lines @@
     std::set<std::string> current_device_set;
     if (!devices.empty()) {
       // Initiate properties fetch for all removable disks,
       for (size_t i = 0; i < devices.size(); i++) {
         current_device_set.insert(devices[i]);
         // Initiate disk property retrieval for each relevant device path.
         cros_disks_client_->GetDeviceProperties(
             devices[i],
             base::Bind(&DiskMountManagerImpl::OnGetDeviceProperties,
                        weak_ptr_factory_.GetWeakPtr()),
-            base::Bind(&DoNothing));
+            base::Bind(&base::DoNothing));
       }
     }
     // Search and remove disks that are no longer present.
     for (DiskMap::iterator iter = disks_.begin(); iter != disks_.end(); ) {
       if (current_device_set.find(iter->first) == current_device_set.end()) {
         Disk* disk = iter->second;
         NotifyDiskStatusUpdate(MOUNT_DISK_REMOVED, disk);
         delete iter->second;
         disks_.erase(iter++);
       } else {
         ++iter;
       }
     }
   }
 
   // Callback to handle mount event signals.
   void OnMountEvent(MountEventType event, const std::string& device_path_arg) {
     // Take a copy of the argument so we can modify it below.
     std::string device_path = device_path_arg;
     DiskMountManagerEventType type = MOUNT_DEVICE_ADDED;
     switch (event) {
       case DISK_ADDED: {
         cros_disks_client_->GetDeviceProperties(
             device_path,
             base::Bind(&DiskMountManagerImpl::OnGetDeviceProperties,
                        weak_ptr_factory_.GetWeakPtr()),
-            base::Bind(&DoNothing));
+            base::Bind(&base::DoNothing));
         return;
       }
       case DISK_REMOVED: {
         // Search and remove disks that are no longer present.
         DiskMountManager::DiskMap::iterator iter = disks_.find(device_path);
         if (iter != disks_.end()) {
           Disk* disk = iter->second;
           NotifyDiskStatusUpdate(MOUNT_DISK_REMOVED, disk);
           delete iter->second;
           disks_.erase(iter);
@@ skipping 83 matching lines @@
     for (SystemPathPrefixSet::const_iterator it = system_path_prefixes_.begin();
          it != system_path_prefixes_.end();
          ++it) {
       const std::string& prefix = *it;
       if (StartsWithASCII(system_path, prefix, true))
         return prefix;
     }
     return EmptyString();
   }
 
-  // A function to be used as an empty callback.
-  static void DoNothing() {
-  }
-
   // Mount event change observers.
   ObserverList<Observer> observers_;
 
   CrosDisksClient* cros_disks_client_;
 
   // The list of disks found.
   DiskMountManager::DiskMap disks_;
 
   DiskMountManager::MountPointMap mount_points_;
 
@@ skipping 123 matching lines @@
   VLOG(1) << "DiskMountManager Shutdown completed";
 }
 
 // static
 DiskMountManager* DiskMountManager::GetInstance() {
   return g_disk_mount_manager;
 }
 
 }  // namespace disks
 }  // namespace chromeos