StorageMonitor: Make StorageInfo a real class.

chrome/browser/media_galleries/media_galleries_dialog_controller.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_dialog_controller.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 18 matching lines @@
 
 namespace {
 
 bool IsAttachedDevice(const std::string& device_id) {
   if (!StorageInfo::IsRemovableDevice(device_id))
     return false;
 
   std::vector<StorageInfo> removable_storages =
       StorageMonitor::GetInstance()->GetAttachedStorage();
   for (size_t i = 0; i < removable_storages.size(); ++i) {
-    if (removable_storages[i].device_id == device_id)
+    if (removable_storages[i].device_id() == device_id)
       return true;
   }
   return false;
 }
 
 // Comparator for sorting GalleryPermissionsVector -- sorts
 // allowed galleries low, and then sorts by absolute path.
 bool GalleriesVectorComparator(
     const MediaGalleriesDialogController::GalleryPermission& a,
     const MediaGalleriesDialogController::GalleryPermission& b) {
@@ skipping 322 matching lines @@
     }
   }
 
   // Lastly, add a new gallery to |new_galleries_|.
   new_galleries_.push_back(GalleryPermission(gallery, true));
   dialog_->UpdateGallery(new_galleries_.back().pref_info, true);
 }
 
 void MediaGalleriesDialogController::OnRemovableStorageAttached(
     const StorageInfo& info) {
-  UpdateGalleriesOnDeviceEvent(info.device_id);
+  UpdateGalleriesOnDeviceEvent(info.device_id());
 }
 
 void MediaGalleriesDialogController::OnRemovableStorageDetached(
     const StorageInfo& info) {
-  UpdateGalleriesOnDeviceEvent(info.device_id);
+  UpdateGalleriesOnDeviceEvent(info.device_id());
 }
 
 void MediaGalleriesDialogController::OnGalleryChanged(
     MediaGalleriesPreferences* pref, const std::string& extension_id) {
   DCHECK_EQ(preferences_, pref);
   if (extension_id.empty() || extension_id == extension_->id())
     UpdateGalleriesOnPreferencesEvent();
 }
 
 void MediaGalleriesDialogController::InitializePermissions() {
@@ skipping 109 matching lines @@
     if (iter->pref_info.device_id == device_id)
       dialog_->UpdateGallery(iter->pref_info, iter->allowed);
   }
 }
 
 // MediaGalleries dialog -------------------------------------------------------
 
 MediaGalleriesDialog::~MediaGalleriesDialog() {}
 
 }  // namespace chrome