Fix file handler executer setting wrong cache path permissions on drive.

BUG=None
TEST=RemoteFileSystem.RemoteMountPoint


Review URL: https://chromiumcodereview.appspot.com/10536065

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141220 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/extensions/file_handler_util.cc

@@ -465,8 +465,7 @@ class FileTaskExecutor::ExecuteTasksFileSystemCallbackDispatcher {
     GURL base_url = fileapi::GetFileSystemRootURI(target_origin_url,
         fileapi::kFileSystemTypeExternal);
     file->target_file_url = GURL(base_url.spec() + virtual_path.value());
-    FilePath root(FILE_PATH_LITERAL("/"));
-    file->virtual_path = root.Append(virtual_path);
+    file->virtual_path = virtual_path;
     file->is_directory = file_info.is_directory;
     file->absolute_path = final_file_path;
     return true;
@@ -624,7 +623,9 @@ void FileTaskExecutor::SetupPermissionsAndDispatchEvent(
     files_urls->Append(file_def);
     file_def->SetString("fileSystemName", file_system_name);
     file_def->SetString("fileSystemRoot", file_system_root.spec());
-    file_def->SetString("fileFullPath", iter->virtual_path.value());
+    FilePath root(FILE_PATH_LITERAL("/"));
+    FilePath full_path = root.Append(iter->virtual_path);
+    file_def->SetString("fileFullPath", full_path.value());
     file_def->SetBoolean("fileIsDirectory", iter->is_directory);
   }
   // Get tab id.
@@ -665,7 +666,7 @@ void FileTaskExecutor::InitHandlerHostFileAccessPermissions(
     // If the file is on gdata mount point, we'll have to give handler host
     // permissions for file's gdata cache paths.
     // This has to be called on UI thread.
-    gdata::util::InsertGDataCachePathsPermissions(profile_, iter->absolute_path,
+    gdata::util::InsertGDataCachePathsPermissions(profile_, iter->virtual_path,
         &handler_host_permissions_);
   }
 }

chrome/browser/chromeos/gdata/gdata_util.cc

@@ -240,7 +240,8 @@ void InsertGDataCachePathsPermissions(
     return;
 
   GDataFileProperties file_properties;
-  file_system->GetFileInfoByPath(gdata_path, &file_properties);
+  if (!file_system->GetFileInfoByPath(gdata_path, &file_properties))
+    return;
 
   std::string resource_id = file_properties.resource_id;
   std::string file_md5 = file_properties.file_md5;