Replace mountType by volumeType on fileBrowserPrivate APIs.

chromeos/disks/disk_mount_manager.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 "chromeos/disks/disk_mount_manager.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 652 matching lines @@
 
 bool DiskMountManager::AddDiskForTest(Disk* disk) {
   return false;
 }
 
 bool DiskMountManager::AddMountPointForTest(const MountPointInfo& mount_point) {
   return false;
 }
 
 // static
-std::string DiskMountManager::MountTypeToString(MountType type) {
-  switch (type) {
-    case MOUNT_TYPE_DEVICE:
-      return "device";
-    case MOUNT_TYPE_ARCHIVE:
-      return "file";
-    case MOUNT_TYPE_NETWORK_STORAGE:
-      return "network";
-    case MOUNT_TYPE_GOOGLE_DRIVE:
-      return "drive";
-    case MOUNT_TYPE_INVALID:
-      return "invalid";
-    default:
-      NOTREACHED();
-  }
-  return "";
-}
-
-// static
 std::string DiskMountManager::MountConditionToString(MountCondition condition) {
   switch (condition) {
     case MOUNT_CONDITION_NONE:
       return "";
     case MOUNT_CONDITION_UNKNOWN_FILESYSTEM:
       return "unknown_filesystem";
     case MOUNT_CONDITION_UNSUPPORTED_FILESYSTEM:
       return "unsupported_filesystem";
     default:
       NOTREACHED();
   }
   return "";
 }
 
 // static
-MountType DiskMountManager::MountTypeFromString(const std::string& type_str) {
-  if (type_str == "device")
-    return MOUNT_TYPE_DEVICE;
-  else if (type_str == "network")
-    return MOUNT_TYPE_NETWORK_STORAGE;
-  else if (type_str == "file")
-    return MOUNT_TYPE_ARCHIVE;
-  else if (type_str == "drive")
-    return MOUNT_TYPE_GOOGLE_DRIVE;
-  else
-    return MOUNT_TYPE_INVALID;
-}
-
-// static
 std::string DiskMountManager::DeviceTypeToString(DeviceType type) {
   switch (type) {
     case DEVICE_TYPE_USB:
       return "usb";
     case DEVICE_TYPE_SD:
       return "sd";
     case DEVICE_TYPE_OPTICAL_DISC:
       return "optical";
     case DEVICE_TYPE_MOBILE:
       return "mobile";
@@ skipping 34 matching lines @@
   VLOG(1) << "DiskMountManager Shutdown completed";
 }
 
 // static
 DiskMountManager* DiskMountManager::GetInstance() {
   return g_disk_mount_manager;
 }
 
 }  // namespace disks
 }  // namespace chromeos