gdata: Apply correct mount label when mounting archives in GData

chrome/browser/chromeos/extensions/file_browser_private_api.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 "chrome/browser/chromeos/extensions/file_browser_private_api.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 129 matching lines @@
 
 base::DictionaryValue* CreateValueFromMountPoint(Profile* profile,
     const DiskMountManager::MountPointInfo& mount_point_info,
     const GURL& extension_source_url) {
 
   base::DictionaryValue *mount_info = new base::DictionaryValue();
 
   mount_info->SetString("mountType",
                         DiskMountManager::MountTypeToString(
                             mount_point_info.mount_type));
-
-  if (mount_point_info.mount_type == chromeos::MOUNT_TYPE_ARCHIVE) {
-    GURL source_url;
-    if (file_manager_util::ConvertFileToFileSystemUrl(profile,
-            FilePath(mount_point_info.source_path),
-            extension_source_url.GetOrigin(),
-            &source_url)) {
-      mount_info->SetString("sourceUrl", source_url.spec());
-     }
-  } else {
-    mount_info->SetString("sourceUrl", mount_point_info.source_path);
-  }
+  mount_info->SetString("sourcePath", mount_point_info.source_path);
 
   FilePath relative_mount_path;
   // Convert mount point path to relative path with the external file system
   // exposed within File API.
   if (file_manager_util::ConvertFileToRelativeFileSystemPath(profile,
           FilePath(mount_point_info.mount_path),
           &relative_mount_path)) {
     mount_info->SetString("mountPath", relative_mount_path.value());
   }
 
@@ skipping 741 matching lines @@
   std::string file_url;
   if (!args_->GetString(0, &file_url)) {
     return false;
   }
 
   std::string mount_type_str;
   if (!args_->GetString(1, &mount_type_str)) {
     return false;
   }
 
+  // Set default return source path to the empty string.
+  result_.reset(Value::CreateStringValue(""));
+
 #if defined(OS_CHROMEOS)
   chromeos::MountType mount_type =
       DiskMountManager::MountTypeFromString(mount_type_str);
   switch (mount_type) {
     case chromeos::MOUNT_TYPE_INVALID: {
       error_ = "Invalid mount type";
       SendResponse(false);
       break;
     }
     case chromeos::MOUNT_TYPE_GDATA: {
@@ skipping 24 matching lines @@
 }
 
 void AddMountFunction::RaiseGDataMountEvent(gdata::GDataErrorCode error) {
   chromeos::MountError error_code = chromeos::MOUNT_ERROR_NONE;
   // For the file manager to work offline, GDATA_NO_CONNECTION is allowed.
   if (error == gdata::HTTP_SUCCESS || error == gdata::GDATA_NO_CONNECTION) {
     error_code = chromeos::MOUNT_ERROR_NONE;
   } else {
     error_code = chromeos::MOUNT_ERROR_NOT_AUTHENTICATED;
   }
-
+  // Pass back the gdata mount point path as source path.
+  const std::string& gdata_path = gdata::util::GetGDataMountPointPathAsString();
+  result_.reset(Value::CreateStringValue(gdata_path));
   DiskMountManager::MountPointInfo mount_info(
-      gdata::util::GetGDataMountPointPathAsString(),
-      gdata::util::GetGDataMountPointPathAsString(),
+      gdata_path,
+      gdata_path,
       chromeos::MOUNT_TYPE_GDATA,
       chromeos::disks::MOUNT_CONDITION_NONE);
   // Raise mount event
   FileBrowserEventRouterFactory::GetForProfile(profile_)->
       MountCompleted(DiskMountManager::MOUNTING, error_code, mount_info);
 }
 
 void AddMountFunction::OnGDataAuthentication(gdata::GDataErrorCode error,
                                              const std::string& token) {
   RaiseGDataMountEvent(error);
@@ skipping 33 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 }
 
 void AddMountFunction::OnMountedStateSet(const std::string& mount_type,
                                          const FilePath::StringType& file_name,
                                          base::PlatformFileError error,
                                          const FilePath& file_path) {
 #if defined(OS_CHROMEOS)
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DiskMountManager* disk_mount_manager = DiskMountManager::GetInstance();
+  // Pass back the actual source path of the mount point.
+  result_.reset(Value::CreateStringValue(file_path.value()));
+  SendResponse(true);
   // MountPath() takes a std::string.
   disk_mount_manager->MountPath(file_path.AsUTF8Unsafe(),
-                                FilePath(file_name).Extension(),
+                                FilePath(file_name).Extension(), file_name,
                                 DiskMountManager::MountTypeFromString(
                                     mount_type));
-  SendResponse(true);
 #endif  // defined(OS_CHROMEOS)
 }
 
 RemoveMountFunction::RemoveMountFunction() {
 }
 
 RemoveMountFunction::~RemoveMountFunction() {
 }
 
 bool RemoveMountFunction::RunImpl() {
@@ skipping 970 matching lines @@
   if (value->GetBoolean("cellularDisabled", &tmp)) {
     service->SetBoolean(prefs::kDisableGDataOverCellular, tmp);
   }
 
   if (value->GetBoolean("hostedFilesDisabled", &tmp)) {
     service->SetBoolean(prefs::kDisableGDataHostedFiles, tmp);
   }
 
   return true;
 }