gdata: Apply correct mount label when mounting archives in GData

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 "base/bind.h"
 #include "base/stl_util.h"
+#include "base/stringprintf.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 const char* kDefaultMountOptions[] = {
   "rw",
   "nodev",
   "noexec",
   "nosuid",
 };
 
 const char* kDefaultUnmountOptions[] = {
   "force",
 };
 
+const char kMountLabelOption[] = "mountlabel";
+
 // Checks if retrieved media type is in boundaries of DeviceMediaType.
 bool IsValidMediaType(uint32 type) {
   return type < static_cast<uint32>(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.
 DeviceType DeviceMediaTypeToDeviceType(uint32 media_type_uint32) {
@@ skipping 67 matching lines @@
   explicit CrosDisksClientImpl(dbus::Bus* bus)
       : proxy_(bus->GetObjectProxy(
           cros_disks::kCrosDisksServiceName,
           dbus::ObjectPath(cros_disks::kCrosDisksServicePath))),
         weak_ptr_factory_(this) {
   }
 
   // CrosDisksClient override.
   virtual void Mount(const std::string& source_path,
                      const std::string& source_format,
+                     const std::string& mount_label,
                      MountType type,
                      const MountCallback& callback,
                      const ErrorCallback& error_callback) OVERRIDE {
     dbus::MethodCall method_call(cros_disks::kCrosDisksInterface,
                                  cros_disks::kMount);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(source_path);
     writer.AppendString(source_format);
     std::vector<std::string> mount_options(kDefaultMountOptions,
                                            kDefaultMountOptions +
                                            arraysize(kDefaultMountOptions));
+    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);
+    }
     writer.AppendArrayOfStrings(mount_options);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&CrosDisksClientImpl::OnMount,
                                   weak_ptr_factory_.GetWeakPtr(),
                                   callback,
                                   error_callback));
   }
 
   // CrosDisksClient override.
   virtual void Unmount(const std::string& device_path,
@@ skipping 232 matching lines @@
 };
 
 // A stub implementaion of CrosDisksClient.
 class CrosDisksClientStubImpl : public CrosDisksClient {
  public:
   CrosDisksClientStubImpl() {}
   virtual ~CrosDisksClientStubImpl() {}
 
   virtual void Mount(const std::string& source_path,
                      const std::string& source_format,
+                     const std::string& mount_label,
                      MountType type,
                      const MountCallback& callback,
                      const ErrorCallback& error_callback) OVERRIDE {}
   virtual void Unmount(const std::string& device_path,
                        const UnmountCallback& callback,
                        const ErrorCallback& error_callback) OVERRIDE {}
   virtual void EnumerateAutoMountableDevices(
       const EnumerateAutoMountableDevicesCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE {}
   virtual void FormatDevice(const std::string& device_path,
@@ skipping 171 matching lines @@
 // static
 CrosDisksClient* CrosDisksClient::Create(DBusClientImplementationType type,
                                          dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new CrosDisksClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new CrosDisksClientStubImpl();
 }
 
 }  // namespace chromeos