chromeos: Remove unused 'type' argument from CrosDisksClient::Mount

BUG=None
TEST=build
R=satorux@chromium.org

Review URL: https://codereview.chromium.org/18556006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211358 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 1 insertions, 11 deletions

diff --git a/chromeos/dbus/cros_disks_client.cc b/chromeos/dbus/cros_disks_client.cc
index a7a4354..fd1183f 100644
--- a/chromeos/dbus/cros_disks_client.cc
+++ b/chromeos/dbus/cros_disks_client.cc
@@ -90,7 +90,6 @@ class CrosDisksClientImpl : public CrosDisksClient {
   virtual void Mount(const std::string& source_path,
                      const std::string& source_format,
                      const std::string& mount_label,
-                     MountType type,
                      const base::Closure& callback,
                      const base::Closure& error_callback) OVERRIDE {
     dbus::MethodCall method_call(cros_disks::kCrosDisksInterface,
@@ -367,15 +366,10 @@ class CrosDisksClientStubImpl : public CrosDisksClient {
   virtual void Mount(const std::string& source_path,
                      const std::string& source_format,
                      const std::string& mount_label,
-                     MountType type,
                      const base::Closure& callback,
                      const base::Closure& error_callback) OVERRIDE {
     // This stub implementation only accepts archive mount requests.
-    if (type != MOUNT_TYPE_ARCHIVE) {
-      FinishMount(MOUNT_ERROR_INTERNAL, source_path, type, std::string(),
-                  callback);
-      return;
-    }
+    const MountType type = MOUNT_TYPE_ARCHIVE;
 
     const base::FilePath mounted_path = GetArchiveMountPoint().Append(
         base::FilePath::FromUTF8Unsafe(mount_label));
diff --git a/chromeos/dbus/cros_disks_client.h b/chromeos/dbus/cros_disks_client.h
index 1d786c9..4d65b2c 100644
--- a/chromeos/dbus/cros_disks_client.h
+++ b/chromeos/dbus/cros_disks_client.h
@@ -238,7 +238,6 @@ class CHROMEOS_EXPORT CrosDisksClient {
   virtual void Mount(const std::string& source_path,
                      const std::string& source_format,
                      const std::string& mount_label,
-                     MountType type,
                      const base::Closure& callback,
                      const base::Closure& error_callback) = 0;
 
diff --git a/chromeos/dbus/fake_cros_disks_client.cc b/chromeos/dbus/fake_cros_disks_client.cc
index 026db43..d40327e 100644
--- a/chromeos/dbus/fake_cros_disks_client.cc
+++ b/chromeos/dbus/fake_cros_disks_client.cc
@@ -21,7 +21,6 @@ FakeCrosDisksClient::~FakeCrosDisksClient() {}
 void FakeCrosDisksClient::Mount(const std::string& source_path,
                                 const std::string& source_format,
                                 const std::string& mount_label,
-                                MountType type,
                                 const base::Closure& callback,
                                 const base::Closure& error_callback) {
 }
diff --git a/chromeos/dbus/fake_cros_disks_client.h b/chromeos/dbus/fake_cros_disks_client.h
index 9850c91..49e8fba 100644
--- a/chromeos/dbus/fake_cros_disks_client.h
+++ b/chromeos/dbus/fake_cros_disks_client.h
@@ -23,7 +23,6 @@ class FakeCrosDisksClient : public CrosDisksClient {
   virtual void Mount(const std::string& source_path,
                      const std::string& source_format,
                      const std::string& mount_label,
-                     MountType type,
                      const base::Closure& callback,
                      const base::Closure& error_callback) OVERRIDE;
   virtual void Unmount(const std::string& device_path,
diff --git a/chromeos/disks/disk_mount_manager.cc b/chromeos/disks/disk_mount_manager.cc
index 32bafca..c7023a5 100644
--- a/chromeos/disks/disk_mount_manager.cc
+++ b/chromeos/disks/disk_mount_manager.cc
@@ -69,7 +69,6 @@ class DiskMountManagerImpl : public DiskMountManager {
         source_path,
         source_format,
         mount_label,
-        type,
         // When succeeds, OnMountCompleted will be called by
         // "MountCompleted" signal instead.
         base::Bind(&base::DoNothing),