StorageMonitor: Make StorageInfo a real class.

chrome/browser/storage_monitor/portable_device_watcher_win.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.
 //
 // Any tasks that communicates with the portable device may take >100ms to
 // complete. Those tasks should be run on an blocking thread instead of the
 // UI thread.
 
 #include "chrome/browser/storage_monitor/portable_device_watcher_win.h"
 
@@ skipping 504 matching lines @@
     string16* storage_object_id) const {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   DCHECK(device_location);
   DCHECK(storage_object_id);
   MTPStorageMap::const_iterator storage_map_iter =
       storage_map_.find(storage_device_id);
   if (storage_map_iter == storage_map_.end())
     return false;
 
   MTPDeviceMap::const_iterator device_iter =
-      device_map_.find(storage_map_iter->second.location);
+      device_map_.find(storage_map_iter->second.location());
   if (device_iter == device_map_.end())
     return false;
   const StorageObjects& storage_objects = device_iter->second;
   for (StorageObjects::const_iterator storage_object_iter =
        storage_objects.begin(); storage_object_iter != storage_objects.end();
        ++storage_object_iter) {
     if (storage_device_id == storage_object_iter->object_persistent_id) {
-      *device_location = storage_map_iter->second.location;
+      *device_location = storage_map_iter->second.location();
       *storage_object_id = storage_object_iter->object_temporary_id;
       return true;
     }
   }
   return false;
 }
 
 // static
 string16 PortableDeviceWatcherWin::GetStoragePathFromStorageId(
     const std::string& storage_unique_id) {
@@ skipping 75 matching lines @@
       return;
 
     // Device can have several data partitions. Therefore, add the
     // partition identifier to the storage name. E.g.: "Nexus 7 (s10001)"
     string16 storage_name(name + L" (" + storage_iter->object_temporary_id +
         L')');
     StorageInfo info(storage_id, storage_name, location,
                      string16(), string16(), string16(), 0);
     storage_map_[storage_id] = info;
     if (storage_notifications_) {
-      info.location = GetStoragePathFromStorageId(storage_id);
+      info.set_location(GetStoragePathFromStorageId(storage_id));
       storage_notifications_->ProcessAttach(info);
     }
   }
   device_map_[location] = storage_objects;
 }
 
 void PortableDeviceWatcherWin::HandleDeviceDetachEvent(
     const string16& pnp_device_id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   MTPDeviceMap::iterator device_iter = device_map_.find(pnp_device_id);
   if (device_iter == device_map_.end())
     return;
 
   const StorageObjects& storage_objects = device_iter->second;
   for (StorageObjects::const_iterator storage_object_iter =
        storage_objects.begin(); storage_object_iter != storage_objects.end();
        ++storage_object_iter) {
     std::string storage_id = storage_object_iter->object_persistent_id;
     MTPStorageMap::iterator storage_map_iter = storage_map_.find(storage_id);
     DCHECK(storage_map_iter != storage_map_.end());
-    if (storage_notifications_)
-      storage_notifications_->ProcessDetach(storage_map_iter->second.device_id);
+    if (storage_notifications_) {
+      storage_notifications_->ProcessDetach(
+          storage_map_iter->second.device_id());
+    }
     storage_map_.erase(storage_map_iter);
   }
   device_map_.erase(device_iter);
 }
 
 }  // namespace chrome