Use .volume_label property for notifying MTP volume labels.

chrome/browser/chromeos/file_manager/volume_manager.cc

 // Copyright 2013 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/chromeos/file_manager/volume_manager.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 711 matching lines @@
   if (!storage_monitor::StorageInfo::IsMTPDevice(info.device_id()))
     return;
   if (profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled))
     return;
 
   const base::FilePath path = base::FilePath::FromUTF8Unsafe(info.location());
   const std::string fsid = GetMountPointNameForMediaStorage(info);
   const std::string base_name = base::UTF16ToUTF8(info.model_name());
 
   // Assign a fresh volume ID based on the volume name.
-  std::string id = kMtpVolumeIdPrefix + base_name;
-  for (int i = 2; mounted_volumes_.count(id); ++i)
-    id = kMtpVolumeIdPrefix + base_name + base::StringPrintf(" (%d)", i);
+  std::string label = base_name;
+  for (int i = 2; mounted_volumes_.count(kMtpVolumeIdPrefix + label); ++i)
+    label = base_name + base::StringPrintf(" (%d)", i);
 
   bool result =
       fileapi::ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
           fsid, fileapi::kFileSystemTypeDeviceMediaAsFileStorage,
           fileapi::FileSystemMountOption(), path);
   DCHECK(result);
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE, base::Bind(
           &MTPDeviceMapService::RegisterMTPFileSystem,
           base::Unretained(MTPDeviceMapService::GetInstance()),
           info.location(), fsid));
 
   VolumeInfo volume_info;
   volume_info.type = VOLUME_TYPE_MTP;
   volume_info.mount_path = path;
   volume_info.mount_condition = chromeos::disks::MOUNT_CONDITION_NONE;
   volume_info.is_parent = true;
   volume_info.is_read_only = true;
-  volume_info.volume_id = id;
+  volume_info.volume_id = kMtpVolumeIdPrefix + label;
+  volume_info.volume_label = label;
   volume_info.source_path = path;
   volume_info.device_type = chromeos::DEVICE_TYPE_MOBILE;
   DoMountEvent(chromeos::MOUNT_ERROR_NONE, volume_info, false);
 }
 
 void VolumeManager::OnRemovableStorageDetached(
     const storage_monitor::StorageInfo& info) {
   if (!storage_monitor::StorageInfo::IsMTPDevice(info.device_id()))
     return;
 
@@ skipping 72 matching lines @@
     return;
   if (error_code == chromeos::MOUNT_ERROR_NONE)
     mounted_volumes_.erase(volume_info.volume_id);
 
   FOR_EACH_OBSERVER(VolumeManagerObserver,
                     observers_,
                     OnVolumeUnmounted(error_code, volume_info));
 }
 
 }  // namespace file_manager