Revert 167606 - [Media Gallery][ChromeOS] Improve device media gallery names.

chrome/browser/system_monitor/removable_device_notifications_chromeos.h

 // 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.
 
 // chromeos::RemovableDeviceNotificationsCros listens for mount point changes
 // and notifies the SystemMonitor about the addition and deletion of media
 // devices.
 
 #ifndef CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_CHROMEOS_H_
 #define CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_CHROMEOS_H_
@@ skipping 42 matching lines @@
       disks::DiskMountManager::MountEvent event_type,
       MountError error_code,
       const disks::DiskMountManager::MountPointInfo& mount_info) OVERRIDE;
 
   // Finds the device that contains |path| and populates |device_info|.
   // Returns false if unable to find the device.
   bool GetDeviceInfoForPath(
       const FilePath& path,
       base::SystemMonitor::RemovableStorageInfo* device_info) const;
 
-  // Returns the storage size of the device present at |location|. If the
-  // device information is unavailable, returns zero.
-  uint64 GetStorageSize(const std::string& location) const;
-
  private:
-  struct StorageObjectInfo {
-    // Basic details {storage device name, location and identifier}.
-    base::SystemMonitor::RemovableStorageInfo storage_info;
-
-    // Device storage size.
-    uint64 storage_size_in_bytes;
-  };
-
   friend class base::RefCountedThreadSafe<RemovableDeviceNotificationsCros>;
 
   // Mapping of mount path to removable mass storage info.
-  typedef std::map<std::string, StorageObjectInfo> MountMap;
+  typedef std::map<std::string, base::SystemMonitor::RemovableStorageInfo>
+      MountMap;
 
   // Private to avoid code deleting the object.
   virtual ~RemovableDeviceNotificationsCros();
 
   // Checks existing mount points map for media devices. For each mount point,
   // call CheckMountedPathOnFileThread() below.
   void CheckExistingMountPointsOnUIThread();
 
   // Checks if the mount point in |mount_info| is a media device. If it is,
   // then continue with AddMountedPathOnUIThread() below.
@@ skipping 10 matching lines @@
   // Mapping of relevant mount points and their corresponding mount devices.
   // Only accessed on the UI thread.
   MountMap mount_map_;
 
   DISALLOW_COPY_AND_ASSIGN(RemovableDeviceNotificationsCros);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_CHROMEOS_H_