StorageMonitor: Make StorageInfo a real class.

chrome/browser/storage_monitor/storage_monitor_win_unittest.cc

Index: chrome/browser/storage_monitor/storage_monitor_win_unittest.cc
===================================================================
--- chrome/browser/storage_monitor/storage_monitor_win_unittest.cc	(revision 201619)
+++ chrome/browser/storage_monitor/storage_monitor_win_unittest.cc	(working copy)
@@ -188,8 +188,8 @@
     StorageInfo info;
     ASSERT_TRUE(volume_mount_watcher_->GetDeviceInfo(
         VolumeMountWatcherWin::DriveNumberToFilePath(*it), &info));
-    if (StorageInfo::IsRemovableDevice(info.device_id))
-      expect_detach_calls++;
+    if (StorageInfo::IsRemovableDevice(info.device_id()))
+      ++expect_detach_calls;
   }
   monitor_->InjectDeviceChange(DBT_DEVICEREMOVECOMPLETE,
                                reinterpret_cast<DWORD>(&volume_broadcast));
@@ -269,10 +269,10 @@
   StorageInfo info;
   EXPECT_TRUE(monitor_->volume_mount_watcher()->GetDeviceInfo(
       base::FilePath(ASCIIToUTF16("F:\\")), &info));
-  EXPECT_EQ(ASCIIToUTF16("F:\\"), info.location);
+  EXPECT_EQ(ASCIIToUTF16("F:\\"), info.location());
   EXPECT_EQ("dcim:\\\\?\\Volume{F0000000-0000-0000-0000-000000000000}\\",
-            info.device_id);
-  EXPECT_EQ(ASCIIToUTF16("F:\\ Drive"), info.storage_label);
+            info.device_id());
+  EXPECT_EQ(ASCIIToUTF16("F:\\ Drive"), info.storage_label());
 
   EXPECT_FALSE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("G:\\")), &info));
@@ -284,9 +284,9 @@
   StorageInfo info2;
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\subdir\\sub")), &info2));
-  EXPECT_EQ(ASCIIToUTF16("F:\\ Drive"), info.storage_label);
-  EXPECT_EQ(ASCIIToUTF16("F:\\ Drive"), info1.storage_label);
-  EXPECT_EQ(ASCIIToUTF16("F:\\ Drive"), info2.storage_label);
+  EXPECT_EQ(ASCIIToUTF16("F:\\ Drive"), info.storage_label());
+  EXPECT_EQ(ASCIIToUTF16("F:\\ Drive"), info1.storage_label());
+  EXPECT_EQ(ASCIIToUTF16("F:\\ Drive"), info2.storage_label());
 }
 
 TEST_F(StorageMonitorWinTest, PathMountDevices) {
@@ -307,26 +307,26 @@
   StorageInfo info;
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\dir")), &info));
-  EXPECT_EQ(L"", info.name);
-  EXPECT_EQ(L"F:\\ Drive", info.storage_label);
+  EXPECT_EQ(L"", info.name());
+  EXPECT_EQ(L"F:\\ Drive", info.storage_label());
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount1")), &info));
-  EXPECT_EQ(L"mount1", info.name);
+  EXPECT_EQ(L"mount1", info.name());
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount1\\dir")), &info));
-  EXPECT_EQ(L"mount1", info.name);
+  EXPECT_EQ(L"mount1", info.name());
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount2\\dir")), &info));
-  EXPECT_EQ(L"mount2", info.name);
+  EXPECT_EQ(L"mount2", info.name());
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount1\\subdir")), &info));
-  EXPECT_EQ(L"mount1subdir", info.name);
+  EXPECT_EQ(L"mount1subdir", info.name());
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount1\\subdir\\dir")), &info));
-  EXPECT_EQ(L"mount1subdir", info.name);
+  EXPECT_EQ(L"mount1subdir", info.name());
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount1\\subdir\\dir\\dir")), &info));
-  EXPECT_EQ(L"mount1subdir", info.name);
+  EXPECT_EQ(L"mount1subdir", info.name());
 }
 
 TEST_F(StorageMonitorWinTest, DevicesAttachedHighBoundary) {
@@ -468,11 +468,11 @@
 
   StorageInfo info;
   ASSERT_TRUE(volume_mount_watcher_->GetDeviceInfo(removable_device, &info));
-  EXPECT_TRUE(StorageInfo::IsRemovableDevice(info.device_id));
-  EXPECT_EQ(info.device_id, device_info.device_id);
-  EXPECT_EQ(info.name, device_info.name);
-  EXPECT_EQ(info.location, device_info.location);
-  EXPECT_EQ(1000000, info.total_size_in_bytes);
+  EXPECT_TRUE(StorageInfo::IsRemovableDevice(info.device_id()));
+  EXPECT_EQ(info.device_id(), device_info.device_id());
+  EXPECT_EQ(info.name(), device_info.name());
+  EXPECT_EQ(info.location(), device_info.location());
+  EXPECT_EQ(1000000, info.total_size_in_bytes());
 
   // A fixed device.
   base::FilePath fixed_device(L"N:\\");
@@ -480,10 +480,10 @@
 
   ASSERT_TRUE(volume_mount_watcher_->GetDeviceInfo(
       fixed_device, &info));
-  EXPECT_FALSE(StorageInfo::IsRemovableDevice(info.device_id));
-  EXPECT_EQ(info.device_id, device_info.device_id);
-  EXPECT_EQ(info.name, device_info.name);
-  EXPECT_EQ(info.location, device_info.location);
+  EXPECT_FALSE(StorageInfo::IsRemovableDevice(info.device_id()));
+  EXPECT_EQ(info.device_id(), device_info.device_id());
+  EXPECT_EQ(info.name(), device_info.name());
+  EXPECT_EQ(info.location(), device_info.location());
 }
 
 // Test to verify basic MTP storage attach and detach notifications.