[StorageMonitor] Remove GetStorageSize.

Use GetStorageInfoForPath to get volume size.

R=thestig@chromium.org
BUG=None


Review URL: https://chromiumcodereview.appspot.com/13524003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192978 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/storage_monitor/media_storage_util.cc

@@ -312,7 +312,7 @@ bool MediaStorageUtil::GetDeviceInfoFromPath(const base::FilePath& path,
 // TODO(gbillock): Don't do this. Leave for clients to do.
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)  // Implies OS_CHROMEOS
     info.name = GetDisplayNameForDevice(
-        monitor->GetStorageSize(info.location),
+        info.total_size_in_bytes,
         GetDisplayNameForSubFolder(info.name, sub_folder_path));
 #endif
 

chrome/browser/storage_monitor/storage_monitor.h

@@ -65,12 +65,6 @@ class StorageMonitor {
       const base::FilePath& path,
       StorageInfo* device_info) const = 0;
 
-  // Returns the storage size of the device present at |location|. If the
-  // device information is unavailable, returns zero.
-  // TODO(gbillock): delete this in favor of GetStorageInfoForPath.
-  virtual uint64 GetStorageSize(
-      const base::FilePath::StringType& location) const = 0;
-
 // TODO(gbillock): make this either unnecessary (implementation-specific) or
 // platform-independent.
 #if defined(OS_WIN)

chrome/browser/storage_monitor/storage_monitor_chromeos.cc

@@ -232,13 +232,6 @@ bool StorageMonitorCros::GetStorageInfoForPath(
   return true;
 }
 
-uint64 StorageMonitorCros::GetStorageSize(
-    const std::string& device_location) const {
-  MountMap::const_iterator info_it = mount_map_.find(device_location);
-  return (info_it != mount_map_.end()) ?
-      info_it->second.total_size_in_bytes : 0;
-}
-
 // Callback executed when the unmount call is run by DiskMountManager.
 // Forwards result to |EjectDevice| caller.
 void NotifyUnmountResult(

chrome/browser/storage_monitor/storage_monitor_chromeos.h

@@ -57,10 +57,6 @@ class StorageMonitorCros
       const base::FilePath& path,
       chrome::StorageInfo* device_info) const OVERRIDE;
 
-  // Returns the storage size of the device present at |location|. If the
-  // device information is unavailable, returns zero.
-  virtual uint64 GetStorageSize(const std::string& location) const OVERRIDE;
-
   virtual void EjectDevice(
       const std::string& device_id,
       base::Callback<void(EjectStatus)> callback) OVERRIDE;

chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc

@@ -15,6 +15,7 @@
 #include "chrome/browser/storage_monitor/media_storage_util.h"
 #include "chrome/browser/storage_monitor/mock_removable_storage_observer.h"
 #include "chrome/browser/storage_monitor/removable_device_constants.h"
+#include "chrome/browser/storage_monitor/storage_info.h"
 #include "chromeos/disks/mock_disk_mount_manager.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -184,7 +185,11 @@ void StorageMonitorCrosTest::UnmountDevice(
 
 uint64 StorageMonitorCrosTest::GetDeviceStorageSize(
     const std::string& device_location) {
-  return monitor_->GetStorageSize(device_location);
+  chrome::StorageInfo info;
+  if (!monitor_->GetStorageInfoForPath(base::FilePath(device_location), &info))
+    return 0;
+
+  return info.total_size_in_bytes;
 }
 
 base::FilePath StorageMonitorCrosTest::CreateMountPoint(

chrome/browser/storage_monitor/storage_monitor_linux.cc

@@ -290,15 +290,6 @@ bool StorageMonitorLinux::GetStorageInfoForPath(
   return true;
 }
 
-uint64 StorageMonitorLinux::GetStorageSize(const std::string& location) const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  MountMap::const_iterator mount_info = mount_info_map_.find(
-      base::FilePath(location));
-  return (mount_info != mount_info_map_.end()) ?
-      mount_info->second.storage_info.total_size_in_bytes : 0;
-}
-
 void StorageMonitorLinux::SetGetDeviceInfoCallbackForTest(
     const GetDeviceInfoCallback& get_device_info_callback) {
   get_device_info_callback_ = get_device_info_callback;

chrome/browser/storage_monitor/storage_monitor_linux.h

@@ -47,10 +47,6 @@ class StorageMonitorLinux : public StorageMonitor,
       const base::FilePath& path,
       StorageInfo* device_info) const OVERRIDE;
 
-  // Returns the storage partition size of the device present at |location|.
-  // If the requested information is unavailable, returns 0.
-  virtual uint64 GetStorageSize(const std::string& location) const OVERRIDE;
-
  protected:
   // Gets device information given a |device_path| and |mount_point|.
   typedef base::Callback<scoped_ptr<StorageInfo>(

chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc

@@ -261,6 +261,14 @@ class StorageMonitorLinuxTest : public testing::Test {
     return monitor_.get();
   }
 
+  uint64 GetStorageSize(const base::FilePath& path) {
+    StorageInfo info;
+    if (!notifier()->GetStorageInfoForPath(path, &info))
+      return 0;
+
+    return info.total_size_in_bytes;
+  }
+
  private:
   // Create a directory named |dir| relative to the test directory.
   // Set |with_dcim_dir| to true if the created directory will have a "DCIM"
@@ -694,11 +702,11 @@ TEST_F(StorageMonitorLinuxTest, DevicePartitionSize) {
   EXPECT_EQ(0, observer().detach_calls());
 
   EXPECT_EQ(GetDevicePartitionSize(kDeviceDCIM1),
-            notifier()->GetStorageSize(test_path_a.value()));
+            GetStorageSize(test_path_a));
   EXPECT_EQ(GetDevicePartitionSize(kDeviceNoDCIM),
-            notifier()->GetStorageSize(test_path_b.value()));
+            GetStorageSize(test_path_b));
   EXPECT_EQ(GetDevicePartitionSize(kInvalidPath),
-            notifier()->GetStorageSize(kInvalidPath));
+            GetStorageSize(base::FilePath(kInvalidPath)));
 }
 
 }  // namespace

chrome/browser/storage_monitor/storage_monitor_mac.h

@@ -42,11 +42,6 @@ class StorageMonitorMac : public StorageMonitor,
       const base::FilePath& path,
       StorageInfo* device_info) const OVERRIDE;
 
-  // Returns the storage size of the device present at |location|. If the
-  // device information is unavailable, returns zero. |location| must be a
-  // top-level mount point.
-  virtual uint64 GetStorageSize(const std::string& location) const OVERRIDE;
-
   virtual void EjectDevice(
       const std::string& device_id,
       base::Callback<void(EjectStatus)> callback) OVERRIDE;

chrome/browser/storage_monitor/storage_monitor_mac.mm

@@ -287,13 +287,6 @@ bool StorageMonitorMac::GetStorageInfoForPath(const base::FilePath& path,
   return false;
 }
 
-uint64 StorageMonitorMac::GetStorageSize(const std::string& location) const {
-  StorageInfo info;
-  if (!FindDiskWithMountPoint(base::FilePath(location), &info))
-    return 0;
-  return info.total_size_in_bytes;
-}
-
 void StorageMonitorMac::EjectDevice(
       const std::string& device_id,
       base::Callback<void(EjectStatus)> callback) {

chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm

@@ -168,20 +168,12 @@ TEST_F(StorageMonitorMacTest, GetStorageInfo) {
   EXPECT_EQ(device_id_, info.device_id);
   EXPECT_EQ(ASCIIToUTF16("977 KB Test Display Name"), info.name);
   EXPECT_EQ(mount_point_.value(), info.location);
-  EXPECT_EQ(1000000ULL, info.total_size_in_bytes);
+  EXPECT_EQ(kTestSize, info.total_size_in_bytes);
 
   EXPECT_FALSE(monitor_->GetStorageInfoForPath(
       base::FilePath("/non/matching/path"), &info));
 }
 
-TEST_F(StorageMonitorMacTest, GetStorageSize) {
-  UpdateDisk(disk_info_, StorageMonitorMac::UPDATE_DEVICE_ADDED);
-  EXPECT_EQ(1, mock_storage_observer_->attach_calls());
-
-  EXPECT_EQ(kTestSize,
-            monitor_->GetStorageSize("/unused_test_directory"));
-}
-
 // Test that mounting a DMG doesn't send a notification.
 TEST_F(StorageMonitorMacTest, DMG) {
   StorageInfo info = CreateStorageInfo(

chrome/browser/storage_monitor/storage_monitor_win.cc

@@ -79,8 +79,8 @@ bool StorageMonitorWin::GetStorageInfoForPath(const base::FilePath& path,
   string16 location;
   std::string unique_id;
   string16 name;
-  bool removable;
-  uint64 total_size_in_bytes;
+  bool removable = false;
+  uint64 total_size_in_bytes = 0;
   if (!GetDeviceInfo(path, &location, &unique_id, &name, &removable,
                      &total_size_in_bytes)) {
     return false;
@@ -116,15 +116,11 @@ bool StorageMonitorWin::GetStorageInfoForPath(const base::FilePath& path,
     device_info->device_id = device_id;
     device_info->name = name;
     device_info->location = location;
+    device_info->total_size_in_bytes = total_size_in_bytes;
   }
   return true;
 }
 
-uint64 StorageMonitorWin::GetStorageSize(
-    const base::FilePath::StringType& location) const {
-  return volume_mount_watcher_->GetStorageSize(location);
-}
-
 bool StorageMonitorWin::GetMTPStorageInfoFromDeviceId(
     const std::string& storage_device_id,
     string16* device_location,

chrome/browser/storage_monitor/storage_monitor_win.h

@@ -42,9 +42,6 @@ class StorageMonitorWin : public StorageMonitor {
       string16* device_location,
       string16* storage_object_id) const OVERRIDE;
 
-  virtual uint64 GetStorageSize(
-      const base::FilePath::StringType& location) const OVERRIDE;
-
  private:
   class PortableDeviceNotifications;
   friend class test::TestStorageMonitorWin;

chrome/browser/storage_monitor/test_storage_monitor.cc

@@ -31,15 +31,11 @@ bool TestStorageMonitor::GetStorageInfoForPath(
         MediaStorageUtil::FIXED_MASS_STORAGE, path.AsUTF8Unsafe());
     device_info->name = path.BaseName().LossyDisplayName();
     device_info->location = path.value();
+    device_info->total_size_in_bytes = 0;
   }
   return true;
 }
 
-uint64 TestStorageMonitor::GetStorageSize(
-    const base::FilePath::StringType& location) const {
-  return 0;
-}
-
 #if defined(OS_WIN)
 bool TestStorageMonitor::GetMTPStorageInfoFromDeviceId(
     const std::string& storage_device_id,

chrome/browser/storage_monitor/test_storage_monitor.h

@@ -23,9 +23,6 @@ class TestStorageMonitor : public chrome::StorageMonitor {
       const base::FilePath& path,
       StorageInfo* device_info) const OVERRIDE;
 
-  virtual uint64 GetStorageSize(
-      const base::FilePath::StringType& location) const OVERRIDE;
-
 #if defined(OS_WIN)
   virtual bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,

chrome/browser/storage_monitor/volume_mount_watcher_win.cc

@@ -322,15 +322,6 @@ bool VolumeMountWatcherWin::GetDeviceInfo(const base::FilePath& device_path,
   return true;
 }
 
-uint64 VolumeMountWatcherWin::GetStorageSize(
-    const base::FilePath::StringType& mount_point) const {
-  MountPointDeviceMetadataMap::const_iterator iter =
-      device_metadata_.find(mount_point);
-  if (iter != device_metadata_.end())
-    return iter->second.total_size_in_bytes;
-  return 0;
-}
-
 void VolumeMountWatcherWin::OnWindowMessage(UINT event_type, LPARAM data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   switch (event_type) {

chrome/browser/storage_monitor/volume_mount_watcher_win.h

@@ -47,10 +47,6 @@ class VolumeMountWatcherWin {
                      bool* removable,
                      uint64* total_size_in_bytes) const;
 
-  // Returns the partition size of the given mount location. Returns 0 if the
-  // location is unknown.
-  uint64 GetStorageSize(const base::FilePath::StringType& mount_point) const;
-
   // Processes DEV_BROADCAST_VOLUME messages and triggers a
   // notification if appropriate.
   void OnWindowMessage(UINT event_type, LPARAM data);