More filesystem cleanup: convert URL-encoded-as-FilePath to actual URL, where

webkit/plugins/ppapi/ppb_file_ref_impl.cc

 // Copyright (c) 2011 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 "webkit/plugins/ppapi/ppb_file_ref_impl.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "googleurl/src/gurl.h"
 #include "ppapi/c/pp_errors.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/file_callbacks.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
 #include "webkit/plugins/ppapi/ppb_file_system_impl.h"
 #include "webkit/plugins/ppapi/var.h"
 
@@ skipping 100 matching lines @@
     return PP_ERROR_BADRESOURCE;
 
   scoped_refptr<PPB_FileSystem_Impl> file_system =
       directory_ref->GetFileSystem();
   if (!file_system || !file_system->opened() ||
       (file_system->type() == PP_FILESYSTEMTYPE_EXTERNAL))
     return PP_ERROR_NOACCESS;
 
   PluginInstance* instance = file_system->instance();
   if (!instance->delegate()->MakeDirectory(
-          directory_ref->GetSystemPath(), PPBoolToBool(make_ancestors),
+          directory_ref->GetFileSystemURL(), PPBoolToBool(make_ancestors),
           new FileCallbacks(instance->module()->AsWeakPtr(), directory_ref_id,
                             callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t Touch(PP_Resource file_ref_id,
               PP_Time last_access_time,
               PP_Time last_modified_time,
               PP_CompletionCallback callback) {
   scoped_refptr<PPB_FileRef_Impl> file_ref(
       Resource::GetAs<PPB_FileRef_Impl>(file_ref_id));
   if (!file_ref)
     return PP_ERROR_BADRESOURCE;
 
   scoped_refptr<PPB_FileSystem_Impl> file_system = file_ref->GetFileSystem();
   if (!file_system || !file_system->opened() ||
       (file_system->type() == PP_FILESYSTEMTYPE_EXTERNAL))
     return PP_ERROR_NOACCESS;
 
   PluginInstance* instance = file_system->instance();
   if (!instance->delegate()->Touch(
-          file_ref->GetSystemPath(), base::Time::FromDoubleT(last_access_time),
+          file_ref->GetFileSystemURL(),
+          base::Time::FromDoubleT(last_access_time),
           base::Time::FromDoubleT(last_modified_time),
           new FileCallbacks(instance->module()->AsWeakPtr(), file_ref_id,
                             callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t Delete(PP_Resource file_ref_id,
                PP_CompletionCallback callback) {
   scoped_refptr<PPB_FileRef_Impl> file_ref(
       Resource::GetAs<PPB_FileRef_Impl>(file_ref_id));
   if (!file_ref)
     return PP_ERROR_BADRESOURCE;
 
   scoped_refptr<PPB_FileSystem_Impl> file_system = file_ref->GetFileSystem();
   if (!file_system || !file_system->opened() ||
       (file_system->type() == PP_FILESYSTEMTYPE_EXTERNAL))
     return PP_ERROR_NOACCESS;
 
   PluginInstance* instance = file_system->instance();
   if (!instance->delegate()->Delete(
-          file_ref->GetSystemPath(),
+          file_ref->GetFileSystemURL(),
           new FileCallbacks(instance->module()->AsWeakPtr(), file_ref_id,
                             callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t Rename(PP_Resource file_ref_id,
                PP_Resource new_file_ref_id,
                PP_CompletionCallback callback) {
@@ skipping 10 matching lines @@
   scoped_refptr<PPB_FileSystem_Impl> file_system = file_ref->GetFileSystem();
   if (!file_system || !file_system->opened() ||
       (file_system != new_file_ref->GetFileSystem()) ||
       (file_system->type() == PP_FILESYSTEMTYPE_EXTERNAL))
     return PP_ERROR_NOACCESS;
 
   // TODO(viettrungluu): Also cancel when the new file ref is destroyed?
   // http://crbug.com/67624
   PluginInstance* instance = file_system->instance();
   if (!instance->delegate()->Rename(
-          file_ref->GetSystemPath(), new_file_ref->GetSystemPath(),
+          file_ref->GetFileSystemURL(), new_file_ref->GetFileSystemURL(),
           new FileCallbacks(instance->module()->AsWeakPtr(), file_ref_id,
                             callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 const PPB_FileRef_Dev ppb_fileref = {
   &Create,
   &IsFileRef,
@@ skipping 95 matching lines @@
     return PP_FILESYSTEMTYPE_EXTERNAL;
 
   return file_system_->type();
 }
 
 std::string PPB_FileRef_Impl::GetPath() const {
   return virtual_path_;
 }
 
 FilePath PPB_FileRef_Impl::GetSystemPath() const {
-  if (GetFileSystemType() == PP_FILESYSTEMTYPE_EXTERNAL)
-    return system_path_;
+  if (GetFileSystemType() != PP_FILESYSTEMTYPE_EXTERNAL) {
+    NOTREACHED();
+    return FilePath();
+  }
+  return system_path_;
+}
 
-  // Since |virtual_path_| starts with a '/', it is considered an absolute path
-  // on POSIX systems. We need to remove the '/' before calling Append() or we
-  // will run into a DCHECK.
-  FilePath virtual_file_path(
-#if defined(OS_WIN)
-      UTF8ToWide(virtual_path_.substr(1))
-#elif defined(OS_POSIX)
-      virtual_path_.substr(1)
-#else
-#error "Unsupported platform."
-#endif
-  );
-  return file_system_->root_path().Append(virtual_file_path);
+GURL PPB_FileRef_Impl::GetFileSystemURL() const {
+  if (GetFileSystemType() != PP_FILESYSTEMTYPE_LOCALPERSISTENT &&
+      GetFileSystemType() != PP_FILESYSTEMTYPE_LOCALTEMPORARY) {
+    NOTREACHED();
+    return GURL();
+  }
+  if (!virtual_path_.size())
+    return file_system_->root_url();
+  // Since |virtual_path_| starts with a '/', it looks like an absolute path.
+  // We need to trim off the '/' before calling Resolve, as FileSystem URLs
+  // start with a storage type identifier that looks like a path segment.
+  return file_system_->root_url().Resolve(virtual_path_.substr(1));
 }
 
 }  // namespace ppapi
 }  // namespace webkit