StorageMonitor: Make StorageInfo a real class.

chrome/browser/storage_monitor/storage_monitor_linux.cc

 // 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.
 
 // StorageMonitorLinux implementation.
 
 #include "chrome/browser/storage_monitor/storage_monitor_linux.h"
 
 #include <mntent.h>
 #include <stdio.h>
@@ skipping 327 matching lines @@
 }
 
 void StorageMonitorLinux::EjectDevice(
     const std::string& device_id,
     base::Callback<void(EjectStatus)> callback) {
   // Find the mount point for the given device ID.
   base::FilePath path;
   base::FilePath device;
   for (MountMap::iterator mount_info = mount_info_map_.begin();
        mount_info != mount_info_map_.end(); ++mount_info) {
-    if (mount_info->second.storage_info.device_id == device_id) {
+    if (mount_info->second.storage_info.device_id() == device_id) {
       path = mount_info->first;
       device = mount_info->second.mount_device;
       mount_info_map_.erase(mount_info);
       break;
     }
   }
 
   if (path.empty()) {
     callback.Run(EJECT_NO_SUCH_DEVICE);
     return;
@@ skipping 26 matching lines @@
     MountPointDeviceMap::const_iterator new_iter = new_mtab.find(mount_point);
     // |mount_point| not in |new_mtab| or |mount_device| is no longer mounted at
     // |mount_point|.
     if (new_iter == new_mtab.end() || (new_iter->second != mount_device)) {
       MountPriorityMap::iterator priority =
           mount_priority_map_.find(mount_device);
       DCHECK(priority != mount_priority_map_.end());
       ReferencedMountPoint::const_iterator has_priority =
           priority->second.find(mount_point);
       if (StorageInfo::IsRemovableDevice(
-              old_iter->second.storage_info.device_id)) {
+              old_iter->second.storage_info.device_id())) {
         DCHECK(has_priority != priority->second.end());
         if (has_priority->second) {
-          receiver()->ProcessDetach(old_iter->second.storage_info.device_id);
+          receiver()->ProcessDetach(old_iter->second.storage_info.device_id());
         }
         if (priority->second.size() > 1)
           multiple_mounted_devices_needing_reattachment.push_back(mount_device);
       }
       priority->second.erase(mount_point);
       if (priority->second.empty())
         mount_priority_map_.erase(mount_device);
       mount_points_to_erase.push_back(mount_point);
     }
   }
@@ skipping 15 matching lines @@
            multiple_mounted_devices_needing_reattachment.begin();
        it != multiple_mounted_devices_needing_reattachment.end();
        ++it) {
     ReferencedMountPoint::iterator first_mount_point_info =
         mount_priority_map_.find(*it)->second.begin();
     const base::FilePath& mount_point = first_mount_point_info->first;
     first_mount_point_info->second = true;
 
     const StorageInfo& mount_info =
         mount_info_map_.find(mount_point)->second.storage_info;
-    DCHECK(StorageInfo::IsRemovableDevice(mount_info.device_id));
+    DCHECK(StorageInfo::IsRemovableDevice(mount_info.device_id()));
     receiver()->ProcessAttach(mount_info);
   }
 
   // Check new mtab entries against existing ones.
   for (MountPointDeviceMap::const_iterator new_iter = new_mtab.begin();
        new_iter != new_mtab.end(); ++new_iter) {
     const base::FilePath& mount_point = new_iter->first;
     const base::FilePath& mount_device = new_iter->second;
     MountMap::iterator old_iter = mount_info_map_.find(mount_point);
     if (old_iter == mount_info_map_.end() ||
@@ skipping 45 matching lines @@
       mount_info_map_.find(other_mount_point)->second;
 }
 
 void StorageMonitorLinux::AddNewMount(const base::FilePath& mount_device,
                                       scoped_ptr<StorageInfo> storage_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!storage_info)
     return;
 
-  DCHECK(!storage_info->device_id.empty());
+  DCHECK(!storage_info->device_id().empty());
 
-  bool removable = StorageInfo::IsRemovableDevice(storage_info->device_id);
-  const base::FilePath mount_point(storage_info->location);
+  bool removable = StorageInfo::IsRemovableDevice(storage_info->device_id());
+  const base::FilePath mount_point(storage_info->location());
 
   MountPointInfo mount_point_info;
   mount_point_info.mount_device = mount_device;
   mount_point_info.storage_info = *storage_info;
   mount_info_map_[mount_point] = mount_point_info;
   mount_priority_map_[mount_device][mount_point] = removable;
   if (removable)
     receiver()->ProcessAttach(*storage_info);
 }
 
 }  // namespace chrome