StorageMonitor: Make StorageInfo a real class.

chrome/browser/storage_monitor/storage_monitor.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_monitor.h"
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/storage_monitor/removable_storage_observer.h"
 #include "chrome/browser/storage_monitor/transient_device_ids.h"
@@ skipping 124 matching lines @@
            on_initialize_callbacks_.begin();
        iter != on_initialize_callbacks_.end(); ++iter) {
     iter->Run();
   }
   on_initialize_callbacks_.clear();
 }
 
 void StorageMonitor::ProcessAttach(const StorageInfo& info) {
   {
     base::AutoLock lock(storage_lock_);
-    if (ContainsKey(storage_map_, info.device_id)) {
+    if (ContainsKey(storage_map_, info.device_id())) {
       // This can happen if our unique id scheme fails. Ignore the incoming
       // non-unique attachment.
       return;
     }
-    storage_map_.insert(std::make_pair(info.device_id, info));
+    storage_map_.insert(std::make_pair(info.device_id(), info));
   }
 
-  DVLOG(1) << "RemovableStorageAttached with name " << UTF16ToUTF8(info.name)
-           << " and id " << info.device_id;
+  DVLOG(1) << "RemovableStorageAttached with name " << UTF16ToUTF8(info.name())
+           << " and id " << info.device_id();
   observer_list_->Notify(
       &RemovableStorageObserver::OnRemovableStorageAttached, info);
 }
 
 void StorageMonitor::ProcessDetach(const std::string& id) {
   StorageInfo info;
   {
     base::AutoLock lock(storage_lock_);
     RemovableStorageMap::iterator it = storage_map_.find(id);
     if (it == storage_map_.end())
       return;
     info = it->second;
     storage_map_.erase(it);
   }
 
   DVLOG(1) << "RemovableStorageDetached for id " << id;
   observer_list_->Notify(
       &RemovableStorageObserver::OnRemovableStorageDetached, info);
 }
 
 }  // namespace chrome