StorageMonitor: Make StorageInfo a real class.

chrome/browser/storage_monitor/storage_monitor_chromeos.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.
 
 // chromeos::StorageMonitorCros implementation.
 
 #include "chrome/browser/storage_monitor/storage_monitor_chromeos.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 52 matching lines @@
   // values.
   string16 device_label = UTF8ToUTF16(disk->device_label());
   chrome::MediaStorageUtil::RecordDeviceInfoHistogram(true, unique_id,
                                                       device_label);
   if (unique_id.empty())
     return false;
 
   chrome::StorageInfo::Type type = has_dcim ?
       chrome::StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM :
       chrome::StorageInfo::REMOVABLE_MASS_STORAGE_NO_DCIM;
-  info->device_id = chrome::StorageInfo::MakeDeviceId(type, unique_id);
-  info->location = mount_info.mount_path;
-  info->vendor_name = UTF8ToUTF16(disk->vendor_name());
-  info->model_name = UTF8ToUTF16(disk->product_name());
-  info->storage_label = device_label;
-  info->total_size_in_bytes = disk->total_size_in_bytes();
+
+  *info = chrome::StorageInfo(
+      chrome::StorageInfo::MakeDeviceId(type, unique_id),
+      string16(),
+      mount_info.mount_path,
+      device_label,
+      UTF8ToUTF16(disk->vendor_name()),
+      UTF8ToUTF16(disk->product_name()),
+      disk->total_size_in_bytes());
   return true;
 }
 
 // Returns whether the mount point in |mount_info| is a media device or not.
 bool CheckMountedPathOnFileThread(
     const disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   return chrome::MediaStorageUtil::HasDcim(
       base::FilePath(mount_info.mount_path));
 }
@@ skipping 95 matching lines @@
           BrowserThread::FILE, FROM_HERE,
           base::Bind(&CheckMountedPathOnFileThread, mount_info),
           base::Bind(&StorageMonitorCros::AddMountedPath,
                      weak_ptr_factory_.GetWeakPtr(), mount_info));
       break;
     }
     case disks::DiskMountManager::UNMOUNTING: {
       MountMap::iterator it = mount_map_.find(mount_info.mount_path);
       if (it == mount_map_.end())
         return;
-      receiver()->ProcessDetach(it->second.device_id);
+      receiver()->ProcessDetach(it->second.device_id());
       mount_map_.erase(it);
       break;
     }
   }
 }
 
 void StorageMonitorCros::OnFormatEvent(
     disks::DiskMountManager::FormatEvent event,
     FormatError error_code,
     const std::string& device_path) {
@@ skipping 43 matching lines @@
   else
     callback.Run(chrome::StorageMonitor::EJECT_FAILURE);
 }
 
 void StorageMonitorCros::EjectDevice(
     const std::string& device_id,
     base::Callback<void(EjectStatus)> callback) {
   std::string mount_path;
   for (MountMap::const_iterator info_it = mount_map_.begin();
        info_it != mount_map_.end(); ++info_it) {
-    if (info_it->second.device_id == device_id)
+    if (info_it->second.device_id() == device_id)
       mount_path = info_it->first;
   }
 
   if (mount_path.empty()) {
     callback.Run(EJECT_NO_SUCH_DEVICE);
     return;
   }
 
   disks::DiskMountManager* manager = disks::DiskMountManager::GetInstance();
   if (!manager) {
@@ skipping 19 matching lines @@
     // in the map before the device attached handler is called. Therefore, an
     // entry for the device already exists in the map.
     return;
   }
 
   // Get the media device uuid and label if exists.
   chrome::StorageInfo info;
   if (!GetDeviceInfo(mount_info, has_dcim, &info))
     return;
 
-  if (info.device_id.empty())
+  if (info.device_id().empty())
     return;
 
   mount_map_.insert(std::make_pair(mount_info.mount_path, info));
 
   receiver()->ProcessAttach(info);
 }
 
 }  // namespace chromeos