StorageMonitor: Make StorageInfo a real class.

chrome/browser/storage_monitor/media_storage_util.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.
 
 #include "chrome/browser/storage_monitor/media_storage_util.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 35 matching lines @@
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, file_util::PathExists(path)));
 }
 
 typedef std::vector<StorageInfo> StorageInfoList;
 
 bool IsRemovableStorageAttached(const std::string& id) {
   StorageInfoList devices = StorageMonitor::GetInstance()->GetAttachedStorage();
   for (StorageInfoList::const_iterator it = devices.begin();
        it != devices.end(); ++it) {
-    if (it->device_id == id)
+    if (it->device_id() == id)
       return true;
   }
   return false;
 }
 
 base::FilePath::StringType FindRemovableStorageLocationById(
     const std::string& device_id) {
   StorageInfoList devices = StorageMonitor::GetInstance()->GetAttachedStorage();
   for (StorageInfoList::const_iterator it = devices.begin();
        it != devices.end(); ++it) {
-    if (it->device_id == device_id)
-      return it->location;
+    if (it->device_id() == device_id)
+      return it->location();
   }
   return base::FilePath::StringType();
 }
 
 void FilterAttachedDevicesOnFileThread(MediaStorageUtil::DeviceIdSet* devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   MediaStorageUtil::DeviceIdSet missing_devices;
 
   for (MediaStorageUtil::DeviceIdSet::const_iterator it = devices->begin();
        it != devices->end();
@@ skipping 76 matching lines @@
   DCHECK(device_info);
   DCHECK(relative_path);
 
   if (!path.IsAbsolute())
     return false;
 
   StorageInfo info;
   StorageMonitor* monitor = StorageMonitor::GetInstance();
   bool found_device = monitor->GetStorageInfoForPath(path, &info);
 
-  if (found_device && StorageInfo::IsRemovableDevice(info.device_id)) {
+  if (found_device && StorageInfo::IsRemovableDevice(info.device_id())) {
     base::FilePath sub_folder_path;
-    base::FilePath device_path(info.location);
+    base::FilePath device_path(info.location());
     if (path != device_path) {
       bool success = device_path.AppendRelativePath(path, &sub_folder_path);
       DCHECK(success);
     }
 
     *device_info = info;
     *relative_path = sub_folder_path;
     return true;
   }
 
   // TODO(vandebo) Check to see if the path points to an iTunes library file.
 
   // On Posix systems, there's one root so any absolute path could be valid.
   // TODO(gbillock): Delete this stanza? Posix systems should have the root
   // volume information. If not, we should move the below into the
   // right GetStorageInfoForPath implementations.
 #if !defined(OS_POSIX)
   if (!found_device)
     return false;
 #endif
 
   // Handle non-removable devices. Note: this is just overwriting
   // good values from StorageMonitor.
   // TODO(gbillock): Make sure return values from that class are definitive,
   // and don't do this here.
-  info.device_id = StorageInfo::MakeDeviceId(StorageInfo::FIXED_MASS_STORAGE,
-                                             path.AsUTF8Unsafe());
+  info.set_device_id(
+      StorageInfo::MakeDeviceId(StorageInfo::FIXED_MASS_STORAGE,
+                                path.AsUTF8Unsafe()));
   *device_info = info;
   *relative_path = base::FilePath();
   return true;
 }
 
 // static
 base::FilePath MediaStorageUtil::FindDevicePathById(
     const std::string& device_id) {
   StorageInfo::Type type;
   std::string unique_id;
@@ skipping 36 matching lines @@
       static_cast<enum DeviceInfoHistogramBuckets>(event_number);
   if (event >= DEVICE_INFO_BUCKET_BOUNDARY) {
     NOTREACHED();
     return;
   }
   UMA_HISTOGRAM_ENUMERATION("MediaDeviceNotifications.DeviceInfo", event,
                             DEVICE_INFO_BUCKET_BOUNDARY);
 }
 
 }  // namespace chrome