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 927 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 input file_url
+  result_.reset(Value::CreateStringValue(file_url));
+
 #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 83 matching lines @@
 
 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();
   // 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));
+  // Pass back the actual source path of the mount point.

[tbarzic, 2012/04/27 05:44:21]

this seems a bit racy.
What if mount completed event gets dispatched before response from this function
is sent? 

It may be safer to send the response before MountPath is called.

[hshi, 2012/04/27 18:48:56]

Done.

+  result_.reset(Value::CreateStringValue(file_path.value()));
   SendResponse(true);
 #endif  // defined(OS_CHROMEOS)
 }
 
 RemoveMountFunction::RemoveMountFunction() {
 }
 
 RemoveMountFunction::~RemoveMountFunction() {
 }
 
@@ 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;
 }