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

chromeos/dbus/cros_disks_client.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/dbus/cros_disks_client.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 22 matching lines @@
 namespace {
 
 const char* kDefaultMountOptions[] = {
     "nodev", "noexec", "nosuid",
 };
 const char kReadOnlyOption[] = "ro";
 const char kReadWriteOption[] = "rw";
 const char kRemountOption[] = "remount";
 const char kMountLabelOption[] = "mountlabel";
 
-const char* kDefaultUnmountOptions[] = {
-  "force",
-};
-
 const char kLazyUnmountOption[] = "lazy";
 
 // Checks if retrieved media type is in boundaries of DeviceMediaType.
 bool IsValidMediaType(uint32_t type) {
   return type < static_cast<uint32_t>(cros_disks::DEVICE_MEDIA_NUM_VALUES);
 }
 
 // Translates enum used in cros-disks to enum used in Chrome.
 // Note that we could just do static_cast, but this is less sensitive to
 // changes in cros-disks.
@@ skipping 69 matching lines @@
   // CrosDisksClient override.
   void Unmount(const std::string& device_path,
                UnmountOptions options,
                const base::Closure& callback,
                const base::Closure& error_callback) override {
     dbus::MethodCall method_call(cros_disks::kCrosDisksInterface,
                                  cros_disks::kUnmount);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(device_path);
 
-    std::vector<std::string> unmount_options(
-        kDefaultUnmountOptions,
-        kDefaultUnmountOptions + arraysize(kDefaultUnmountOptions));
+    std::vector<std::string> unmount_options;
     if (options == UNMOUNT_OPTIONS_LAZY)
       unmount_options.push_back(kLazyUnmountOption);
 
     writer.AppendArrayOfStrings(unmount_options);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&CrosDisksClientImpl::OnUnmount,
                                   weak_ptr_factory_.GetWeakPtr(),
                                   callback,
                                   error_callback));
   }
@@ skipping 527 matching lines @@
 
   if (!mount_label.empty()) {
     std::string mount_label_option =
         base::StringPrintf("%s=%s", kMountLabelOption, mount_label.c_str());
     mount_options.push_back(mount_label_option);
   }
   return mount_options;
 }
 
 }  // namespace chromeos