StorageMonitor: Make StorageInfo a real class.

chrome/browser/media_galleries/media_galleries_preferences.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/media_galleries/media_galleries_preferences.h"
 
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
@@ skipping 240 matching lines @@
 
   for (size_t i = 0; i < arraysize(kDirectoryKeys); ++i) {
     base::FilePath path;
     if (!PathService::Get(kDirectoryKeys[i], &path))
       continue;
 
     base::FilePath relative_path;
     StorageInfo info;
     if (MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path)) {
       // TODO(gbillock): Add in the volume metadata here when available.
-      AddGalleryWithName(info.device_id, info.name, relative_path,
+      AddGalleryWithName(info.device_id(), info.name(), relative_path,
                          false /*user added*/);
     }
   }
 }
 
 void MediaGalleriesPreferences::OnITunesDeviceID(const std::string& device_id) {
   DCHECK(!device_id.empty());
   AddGalleryWithName(device_id, ASCIIToUTF16(kITunesGalleryName),
                      base::FilePath(), false /*not user added*/);
 }
@@ skipping 36 matching lines @@
   gallery_change_observers_.AddObserver(observer);
 }
 
 void MediaGalleriesPreferences::RemoveGalleryChangeObserver(
     GalleryChangeObserver* observer) {
   gallery_change_observers_.RemoveObserver(observer);
 }
 
 void MediaGalleriesPreferences::OnRemovableStorageAttached(
     const StorageInfo& info) {
-  if (!StorageInfo::IsMediaDevice(info.device_id))
+  if (!StorageInfo::IsMediaDevice(info.device_id()))
     return;
 
-  if (info.name.empty()) {
-    AddGallery(info.device_id, base::FilePath(),
+  if (info.name().empty()) {
+    AddGallery(info.device_id(),
+               base::FilePath(),
                false /*not user added*/,
-               info.storage_label,
-               info.vendor_name,
-               info.model_name,
-               info.total_size_in_bytes,
+               info.storage_label(),
+               info.vendor_name(),
+               info.model_name(),
+               info.total_size_in_bytes(),
                base::Time::Now());
   } else {
     // TODO(gbillock): get rid of this code path.
-    AddGalleryWithName(info.device_id, info.name, base::FilePath(), false);
+    AddGalleryWithName(info.device_id(), info.name(), base::FilePath(), false);
   }
 }
 
 bool MediaGalleriesPreferences::LookUpGalleryByPath(
     const base::FilePath& path,
     MediaGalleryPrefInfo* gallery_info) const {
   StorageInfo info;
   base::FilePath relative_path;
   if (!MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path)) {
     if (gallery_info)
       *gallery_info = MediaGalleryPrefInfo();
     return false;
   }
 
   relative_path = relative_path.NormalizePathSeparators();
   MediaGalleryPrefIdSet galleries_on_device =
-      LookUpGalleriesByDeviceId(info.device_id);
+      LookUpGalleriesByDeviceId(info.device_id());
   for (MediaGalleryPrefIdSet::const_iterator it = galleries_on_device.begin();
        it != galleries_on_device.end();
        ++it) {
     const MediaGalleryPrefInfo& gallery = known_galleries_.find(*it)->second;
     if (gallery.path != relative_path)
       continue;
 
     if (gallery_info)
       *gallery_info = gallery;
     return true;
   }
 
   // This method is called by controller::FilesSelected when the user
   // adds a new gallery. Control reaches here when the selected gallery is
   // on a volume we know about, but have no gallery already for. Returns
   // hypothetical data to the caller about what the prefs will look like
   // if the gallery is added.
   // TODO(gbillock): split this out into another function so it doesn't
   // conflate LookUp.
   if (gallery_info) {
     gallery_info->pref_id = kInvalidMediaGalleryPrefId;
-    gallery_info->display_name = info.name;
-    gallery_info->device_id = info.device_id;
+    gallery_info->display_name = info.name();
+    gallery_info->device_id = info.device_id();
     gallery_info->path = relative_path;
     gallery_info->type = MediaGalleryPrefInfo::kUserAdded;
     // TODO(gbillock): Need to add volume metadata here from |info|.
   }
   return false;
 }
 
 MediaGalleryPrefIdSet MediaGalleriesPreferences::LookUpGalleriesByDeviceId(
     const std::string& device_id) const {
   DeviceIdPrefIdsMap::const_iterator found = device_map_.find(device_id);
@@ skipping 304 matching lines @@
 }
 
 extensions::ExtensionPrefs*
 MediaGalleriesPreferences::GetExtensionPrefs() const {
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   return extension_service->extension_prefs();
 }
 
 }  // namespace chrome