StorageMonitor: Make StorageInfo a real class.

chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm

Index: chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm
===================================================================
--- chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm	(revision 201619)
+++ chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm	(working copy)
@@ -87,16 +87,16 @@
 
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
-  EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id);
-  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name);
+  EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
+  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(mount_point_.value(),
-            mock_storage_observer_->last_attached().location);
+            mock_storage_observer_->last_attached().location());
 
   UpdateDisk(disk_info_, StorageMonitorMac::UPDATE_DEVICE_REMOVED);
 
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(1, mock_storage_observer_->detach_calls());
-  EXPECT_EQ(device_id_, mock_storage_observer_->last_detached().device_id);
+  EXPECT_EQ(device_id_, mock_storage_observer_->last_detached().device_id());
 }
 
 TEST_F(StorageMonitorMacTest, UpdateVolumeName) {
@@ -104,12 +104,12 @@
 
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
-  EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id);
-  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name);
+  EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
+  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(kTestSize,
-            mock_storage_observer_->last_attached().total_size_in_bytes);
+            mock_storage_observer_->last_attached().total_size_in_bytes());
   EXPECT_EQ(mount_point_.value(),
-            mock_storage_observer_->last_attached().location);
+            mock_storage_observer_->last_attached().location());
 
   StorageInfo info2 = CreateStorageInfo(
       device_id_, "", mount_point_, kTestSize * 2);
@@ -117,14 +117,14 @@
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(1, mock_storage_observer_->detach_calls());
-  EXPECT_EQ(device_id_, mock_storage_observer_->last_detached().device_id);
+  EXPECT_EQ(device_id_, mock_storage_observer_->last_detached().device_id());
   EXPECT_EQ(2, mock_storage_observer_->attach_calls());
-  EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id);
-  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name);
+  EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
+  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(kTestSize * 2,
-            mock_storage_observer_->last_attached().total_size_in_bytes);
+            mock_storage_observer_->last_attached().total_size_in_bytes());
   EXPECT_EQ(mount_point_.value(),
-            mock_storage_observer_->last_attached().location);
+            mock_storage_observer_->last_attached().location());
 }
 
 TEST_F(StorageMonitorMacTest, DCIM) {
@@ -142,10 +142,10 @@
 
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
-  EXPECT_EQ(device_id, mock_storage_observer_->last_attached().device_id);
-  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name);
+  EXPECT_EQ(device_id, mock_storage_observer_->last_attached().device_id());
+  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(mount_point.value(),
-            mock_storage_observer_->last_attached().location);
+            mock_storage_observer_->last_attached().location());
 }
 
 TEST_F(StorageMonitorMacTest, GetStorageInfo) {
@@ -153,18 +153,18 @@
 
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
-  EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id);
-  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name);
+  EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
+  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(mount_point_.value(),
-            mock_storage_observer_->last_attached().location);
+            mock_storage_observer_->last_attached().location());
 
   StorageInfo info;
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(mount_point_.AppendASCII("foo"),
                                               &info));
-  EXPECT_EQ(device_id_, info.device_id);
-  EXPECT_EQ(string16(), info.name);
-  EXPECT_EQ(mount_point_.value(), info.location);
-  EXPECT_EQ(kTestSize, info.total_size_in_bytes);
+  EXPECT_EQ(device_id_, info.device_id());
+  EXPECT_EQ(string16(), info.name());
+  EXPECT_EQ(mount_point_.value(), info.location());
+  EXPECT_EQ(kTestSize, info.total_size_in_bytes());
 
   EXPECT_FALSE(monitor_->GetStorageInfoForPath(
       base::FilePath("/non/matching/path"), &info));