StorageMonitor: Make StorageInfo a real class.

chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc

 // Copyright (c) 2013 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.
 //
 // TestVolumeMountWatcherWin implementation.
 
 #include "chrome/browser/storage_monitor/test_volume_mount_watcher_win.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 26 matching lines @@
 
 // Gets the details of the mass storage device specified by the |device_path|.
 // |device_path| inputs of 'A:\' - 'Z:\' are valid. 'N:\' is not removable.
 // 'C:\' is not removable (so that auto-added paths are correctly handled).
 bool GetMassStorageDeviceDetails(const base::FilePath& device_path,
                                  StorageInfo* info) {
   DCHECK(info);
 
   // Truncate to root path.
   base::FilePath path(device_path);
-  if (device_path.value().length() > 3) {
+  if (device_path.value().length() > 3)
     path = base::FilePath(device_path.value().substr(0, 3));
+  if (path.value()[0] < L'A' || path.value()[0] > L'Z')

[Greg Billock, 2013/05/22 23:39:00]

Needed in test?

[Lei Zhang, 2013/05/23 16:44:49]

Maybe for StorageMonitorWinTest.DevicesAttachedHighBoundary?

+    return false;
+
+  StorageInfo::Type type = StorageInfo::FIXED_MASS_STORAGE;
+  if (path.value() != ASCIIToUTF16("N:\\") &&
+      path.value() != ASCIIToUTF16("C:\\")) {
+    type = StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM;
   }
-  if (path.value()[0] < L'A' || path.value()[0] > L'Z') {
-    return false;
-  }
-
-  info->location = path.value();
-  info->total_size_in_bytes = 1000000;
-
   std::string unique_id =
       "\\\\?\\Volume{00000000-0000-0000-0000-000000000000}\\";
   unique_id[11] = device_path.value()[0];
-  chrome::StorageInfo::Type type = chrome::StorageInfo::FIXED_MASS_STORAGE;
-  if (path.value() != ASCIIToUTF16("N:\\") &&
-      path.value() != ASCIIToUTF16("C:\\")) {
-    type = chrome::StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM;
-  }
-  info->device_id = chrome::StorageInfo::MakeDeviceId(type, unique_id);
-  info->storage_label = path.Append(L" Drive").LossyDisplayName();
+  std::string device_id = StorageInfo::MakeDeviceId(type, unique_id);
+  string16 storage_label = path.Append(L" Drive").LossyDisplayName();
+  *info = StorageInfo(device_id, string16(), path.value(), storage_label,
+                      string16(), string16(), 1000000);
+
   return true;
 }
 
 }  // namespace
 
 // TestVolumeMountWatcherWin ---------------------------------------------------
 
 TestVolumeMountWatcherWin::TestVolumeMountWatcherWin()
     : attached_devices_fake_(false) {}
 
 TestVolumeMountWatcherWin::~TestVolumeMountWatcherWin() {
 }
 
 void TestVolumeMountWatcherWin::AddDeviceForTesting(
     const base::FilePath& device_path,
     const std::string& device_id,
     const string16& device_name,
     uint64 total_size_in_bytes) {
-  StorageInfo info;
-  info.device_id = device_id;
-  info.location = device_path.value();
-  info.name = device_name;
-  info.total_size_in_bytes = total_size_in_bytes;
+  StorageInfo info(device_id, device_name, device_path.value(),
+                   string16(), string16(), string16(), total_size_in_bytes);
   HandleDeviceAttachEventOnUIThread(device_path, info);
 }
 
 void TestVolumeMountWatcherWin::SetAttachedDevicesFake() {
   attached_devices_fake_ = true;
 }
 
 void TestVolumeMountWatcherWin::FlushWorkerPoolForTesting() {
   device_info_worker_pool_->FlushForTesting();
 }
@@ skipping 13 matching lines @@
 
 void TestVolumeMountWatcherWin::ReleaseDeviceCheck() {
   device_check_complete_event_->Signal();
 }
 
 bool TestVolumeMountWatcherWin::GetDeviceRemovable(
     const base::FilePath& device_path,
     bool* removable) const {
   StorageInfo info;
   bool success = GetMassStorageDeviceDetails(device_path, &info);
-  *removable = StorageInfo::IsRemovableDevice(info.device_id);
+  *removable = StorageInfo::IsRemovableDevice(info.device_id());
   return success;
 }
 
 VolumeMountWatcherWin::GetDeviceDetailsCallbackType
 TestVolumeMountWatcherWin::GetDeviceDetailsCallback() const {
   return base::Bind(&GetMassStorageDeviceDetails);
 }
 
 VolumeMountWatcherWin::GetAttachedDevicesCallbackType
   TestVolumeMountWatcherWin::GetAttachedDevicesCallback() const {
   if (attached_devices_fake_)
     return base::Bind(&FakeGetAttachedDevices);
 
   return base::Bind(&FakeGetSingleAttachedDevice);
 }
 
 void TestVolumeMountWatcherWin::ShutdownWorkerPool() {
   device_info_worker_pool_->Shutdown();
 }
 
 }  // namespace test
 }  // namespace chrome