Rename SystemMonitor's MediaDevice calls to RemovableStorage.

chrome/browser/media_gallery/media_device_notifications_linux.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.
 
 // MediaDeviceNotificationsLinux implementation.
 
 #include "chrome/browser/media_gallery/media_device_notifications_linux.h"
 
 #include <libudev.h>
 #include <mntent.h>
@@ skipping 339 matching lines @@
 }
 
 void MediaDeviceNotificationsLinux::CheckAndAddMediaDevice(
     const std::string& mount_device,
     const std::string& mount_point) {
   if (!IsMediaDevice(mount_point))
     return;
 
   std::string id;
   string16 name;
-  bool result = (*get_device_info_func_)(mount_device, &id, &name);
+  bool result = get_device_info_func_(mount_device, &id, &name);
 
   // Keep track of GetDeviceInfo result, to see how often we fail to get device
   // details.
   UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.device_info_available",
                         result);
   if (!result)
     return;
 
   // Keep track of device uuid, to see how often we receive empty values.
   UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.device_uuid_available",
                         !id.empty());
   UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.device_name_available",
                         !name.empty());
 
   if (id.empty() || name.empty())
     return;
 
   MountDeviceAndId mount_device_and_id;
   mount_device_and_id.mount_device = mount_device;
   mount_device_and_id.device_id = id;
   mount_info_map_[mount_point] = mount_device_and_id;
 
-  SystemMonitor::Get()->ProcessMediaDeviceAttached(id, name, mount_point);
+  SystemMonitor::Get()->ProcessRemovableStorageAttached(id, name, mount_point);
 }
 
 void MediaDeviceNotificationsLinux::RemoveOldDevice(
     const std::string& device_id) {
-  SystemMonitor::Get()->ProcessMediaDeviceDetached(device_id);
+  SystemMonitor::Get()->ProcessRemovableStorageDetached(device_id);
 }
 
 }  // namespace chrome