Rename SystemMonitor's MediaDevice calls to RemovableStorage.

chrome/browser/media_gallery/media_file_system_registry.cc

 // Copyright (c) 2012 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.
 
 // MediaFileSystemRegistry implementation.
 
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
 
 #include <set>
 
@@ skipping 71 matching lines @@
     // TODO(vandebo) file system galleries need a unique id as well.
     if (PathService::Get(chrome::DIR_USER_PICTURES, &pictures_path) &&
         IsGalleryPermittedForExtension(extension, pictures_path.value())) {
       std::string fsid = RegisterPathAsFileSystem(pictures_path);
       child_it->second.insert(std::make_pair(pictures_path, fsid));
     }
   }
 
   // TODO(thestig) Handle overlap between devices and media directories.
   SystemMonitor* monitor = SystemMonitor::Get();
-  const std::vector<SystemMonitor::MediaDeviceInfo> media_devices =
-      monitor->GetAttachedMediaDevices();
+  const std::vector<SystemMonitor::RemovableStorageInfo> media_devices =
+      monitor->GetAttachedRemovableStorage();
   for (size_t i = 0; i < media_devices.size(); ++i) {
     MediaStorageUtil::Type type;
-    MediaStorageUtil::CrackDeviceId(media_devices[i].unique_id, &type, NULL);
+    MediaStorageUtil::CrackDeviceId(media_devices[i].device_id, &type, NULL);
     // TODO(vandebo) Handle MTP devices.
     if (type != MediaStorageUtil::USB_MTP &&
         IsGalleryPermittedForExtension(extension, media_devices[i].location)) {
-      device_id_map_.insert(std::make_pair(media_devices[i].unique_id,
+      device_id_map_.insert(std::make_pair(media_devices[i].device_id,
                                            media_devices[i]));
       FilePath path(media_devices[i].location);
       const std::string fsid = RegisterPathAsFileSystem(path);
       child_it->second.insert(std::make_pair(path, fsid));
     }
   }
 
   MediaPathToFSIDMap& child_map = child_it->second;
   for (MediaPathToFSIDMap::const_iterator it = child_map.begin();
        it != child_map.end();
        ++it) {
     MediaFSInfo entry;
     // TODO(vandebo) use a better name, fsid for now.
     entry.name = it->second;
     entry.fsid = it->second;
     entry.path = it->first;
     results.push_back(entry);
   }
   return results;
 }
 
-void MediaFileSystemRegistry::OnMediaDeviceDetached(const std::string& id) {
+void MediaFileSystemRegistry::OnRemovableStorageDetached(
+    const std::string& id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DeviceIdToInfoMap::iterator it = device_id_map_.find(id);
   if (it == device_id_map_.end())
     return;
 
   FilePath path(it->second.location);
   RevokeMediaFileSystem(path);
   device_id_map_.erase(it);
 }
@@ skipping 85 matching lines @@
     MediaPathToFSIDMap& child_map = child_it->second;
     MediaPathToFSIDMap::iterator media_path_it = child_map.find(path);
     if (media_path_it == child_map.end())
       continue;
 
     child_map.erase(media_path_it);
   }
 }
 
 }  // namespace chrome