StorageMonitor: Make StorageInfo a real class.

chrome/browser/media_galleries/media_file_system_registry.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.
 
 // MediaFileSystemRegistry implementation.
 
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 
 #include <set>
 #include <vector>
@@ skipping 456 matching lines @@
   // once per profile.
   extension_hosts_map_[profile] = ExtensionHostMap();
 
   // TODO(gbillock): Move this stanza to MediaGalleriesPreferences init code.
   // StorageMonitor may be NULL in unit tests.
   StorageMonitor* monitor = StorageMonitor::GetInstance();
   if (!monitor)
     return preferences;
   std::vector<StorageInfo> existing_devices = monitor->GetAttachedStorage();
   for (size_t i = 0; i < existing_devices.size(); i++) {
-    if (!StorageInfo::IsMediaDevice(existing_devices[i].device_id))
+    if (!StorageInfo::IsMediaDevice(existing_devices[i].device_id()))
       continue;
-    if (!existing_devices[i].name.empty()) {
-      preferences->AddGalleryWithName(existing_devices[i].device_id,
-                                      existing_devices[i].name,
+    if (!existing_devices[i].name().empty()) {
+      preferences->AddGalleryWithName(existing_devices[i].device_id(),
+                                      existing_devices[i].name(),
                                       base::FilePath(),
                                       false /*not user added*/);
     } else {
-      preferences->AddGallery(existing_devices[i].device_id,
+      preferences->AddGallery(existing_devices[i].device_id(),
                               base::FilePath(),
                               false,
-                              existing_devices[i].storage_label,
-                              existing_devices[i].vendor_name,
-                              existing_devices[i].model_name,
-                              existing_devices[i].total_size_in_bytes,
+                              existing_devices[i].storage_label(),
+                              existing_devices[i].vendor_name(),
+                              existing_devices[i].model_name(),
+                              existing_devices[i].total_size_in_bytes(),
                               base::Time::Now());
     }
   }
   return preferences;
 }
 
 void MediaFileSystemRegistry::OnRemovableStorageDetached(
     const StorageInfo& info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Since revoking a gallery in the ExtensionGalleriesHost may cause it
   // to be removed from the map and therefore invalidate any iterator pointing
   // to it, this code first copies all the invalid gallery ids and the
   // extension hosts in which they may appear (per profile) and revoked it in
   // a second step.
   std::vector<InvalidatedGalleriesInfo> invalid_galleries_info;
 
   for (ExtensionGalleriesHostMap::iterator profile_it =
            extension_hosts_map_.begin();
        profile_it != extension_hosts_map_.end();
        ++profile_it) {
     MediaGalleriesPreferences* preferences = GetPreferences(profile_it->first);
     InvalidatedGalleriesInfo invalid_galleries_in_profile;
     invalid_galleries_in_profile.pref_ids =
-        preferences->LookUpGalleriesByDeviceId(info.device_id);
+        preferences->LookUpGalleriesByDeviceId(info.device_id());
 
     for (ExtensionHostMap::const_iterator extension_host_it =
              profile_it->second.begin();
          extension_host_it != profile_it->second.end();
          ++extension_host_it) {
       invalid_galleries_in_profile.extension_hosts.insert(
           extension_host_it->second.get());
     }
 
     invalid_galleries_info.push_back(invalid_galleries_in_profile);
@@ skipping 193 matching lines @@
     // previously used.
     PrefChangeRegistrarMap::iterator pref_it =
         pref_change_registrar_map_.find(profile);
     DCHECK(pref_it != pref_change_registrar_map_.end());
     delete pref_it->second;
     pref_change_registrar_map_.erase(pref_it);
   }
 }
 
 }  // namespace chrome