Commit 8bcaea14 authored by benchan's avatar benchan Committed by Commit bot

Stop passing "force" option when invoking cros-disks's Unmount method.

cros-disks's Unmount method now ignores the "force" option (CL:388592,
chromium:646224). This CL updates CrosDisksClient to stop passing the
"force" option when invoking the Unmount method.

BUG=700548
TEST=chromos_unittests

Review-Url: https://codereview.chromium.org/2743113003
Cr-Commit-Position: refs/heads/master@{#456230}
parent 379e35f6
...@@ -40,10 +40,6 @@ const char kReadWriteOption[] = "rw"; ...@@ -40,10 +40,6 @@ const char kReadWriteOption[] = "rw";
const char kRemountOption[] = "remount"; const char kRemountOption[] = "remount";
const char kMountLabelOption[] = "mountlabel"; const char kMountLabelOption[] = "mountlabel";
const char* kDefaultUnmountOptions[] = {
"force",
};
const char kLazyUnmountOption[] = "lazy"; const char kLazyUnmountOption[] = "lazy";
// Checks if retrieved media type is in boundaries of DeviceMediaType. // Checks if retrieved media type is in boundaries of DeviceMediaType.
...@@ -133,9 +129,7 @@ class CrosDisksClientImpl : public CrosDisksClient { ...@@ -133,9 +129,7 @@ class CrosDisksClientImpl : public CrosDisksClient {
dbus::MessageWriter writer(&method_call); dbus::MessageWriter writer(&method_call);
writer.AppendString(device_path); writer.AppendString(device_path);
std::vector<std::string> unmount_options( std::vector<std::string> unmount_options;
kDefaultUnmountOptions,
kDefaultUnmountOptions + arraysize(kDefaultUnmountOptions));
if (options == UNMOUNT_OPTIONS_LAZY) if (options == UNMOUNT_OPTIONS_LAZY)
unmount_options.push_back(kLazyUnmountOption); unmount_options.push_back(kLazyUnmountOption);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment