StorageMonitor: Make StorageInfo a real class.

chrome/browser/storage_monitor/storage_info.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/storage_monitor/storage_info.h"
 
 #include "base/logging.h"
 
 namespace chrome {
 
 namespace {
 
 // Prefix constants for different device id spaces.
 const char kRemovableMassStorageWithDCIMPrefix[] = "dcim:";
 const char kRemovableMassStorageNoDCIMPrefix[] = "nodcim:";
 const char kFixedMassStoragePrefix[] = "path:";
 const char kMtpPtpPrefix[] = "mtp:";
 const char kMacImageCapturePrefix[] = "ic:";
 const char kITunesPrefix[] = "itunes:";
 
 }  // namespace
 
-StorageInfo::StorageInfo() : total_size_in_bytes(0) {
+StorageInfo::StorageInfo() : total_size_in_bytes_(0) {
 }
 
 StorageInfo::StorageInfo(const std::string& device_id_in,
                          const string16& device_name,
                          const base::FilePath::StringType& device_location,
                          const string16& label,
                          const string16& vendor,
                          const string16& model,
                          uint64 size_in_bytes)
-    : device_id(device_id_in),
-      name(device_name),
-      location(device_location),
-      storage_label(label),
-      vendor_name(vendor),
-      model_name(model),
-      total_size_in_bytes(size_in_bytes) {
+    : device_id_(device_id_in),
+      name_(device_name),
+      location_(device_location),
+      storage_label_(label),
+      vendor_name_(vendor),
+      model_name_(model),
+      total_size_in_bytes_(size_in_bytes) {
 }
 
 StorageInfo::~StorageInfo() {
 }
 
 // static
 std::string StorageInfo::MakeDeviceId(Type type, const std::string& unique_id) {
   DCHECK(!unique_id.empty());
   switch (type) {
     case REMOVABLE_MASS_STORAGE_WITH_DCIM:
@@ skipping 68 matching lines @@
 bool StorageInfo::IsMassStorageDevice(const std::string& device_id) {
   Type type;
   return CrackDeviceId(device_id, &type, NULL) &&
          (type == REMOVABLE_MASS_STORAGE_WITH_DCIM ||
           type == REMOVABLE_MASS_STORAGE_NO_DCIM ||
           type == FIXED_MASS_STORAGE ||
           type == ITUNES);
 }
 
 }  // namespace chrome