Fixed file/directory url resolution for external mount point provider.

webkit/fileapi/file_system_path_manager.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/fileapi/file_system_path_manager.h"
 
 #include "base/rand_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 36 matching lines @@
               file_message_loop,
               profile_path)) {
 #if defined(OS_CHROMEOS)
   external_provider_.reset(
       new chromeos::CrosMountPointProvider(special_storage_policy));
 #endif
 }
 
 FileSystemPathManager::~FileSystemPathManager() {}
 
-void FileSystemPathManager::GetFileSystemRootPath(
+void FileSystemPathManager::ValidateFileSystemRootAndGetURL(
     const GURL& origin_url, fileapi::FileSystemType type,
     bool create, GetRootPathCallback* callback_ptr) {
 
   switch (type) {
   case kFileSystemTypeTemporary:
   case kFileSystemTypePersistent:
-    sandbox_provider_->GetFileSystemRootPath(
+    sandbox_provider_->ValidateFileSystemRootAndGetURL(
         origin_url, type, create, callback_ptr);
     break;
   case kFileSystemTypeExternal:
     if (external_provider_.get()) {
-      external_provider_->GetFileSystemRootPath(
+      external_provider_->ValidateFileSystemRootAndGetURL(
           origin_url, type, create, callback_ptr);
     } else {
       callback_ptr->Run(false, FilePath(), std::string());
     }
     break;
   case kFileSystemTypeUnknown:
   default:
     NOTREACHED();
     callback_ptr->Run(false, FilePath(), std::string());
   }
 }
 
-FilePath FileSystemPathManager::GetFileSystemRootPathOnFileThread(
+FilePath FileSystemPathManager::ValidateFileSystemRootAndGetPathOnFileThread(
     const GURL& origin_url, FileSystemType type, const FilePath& virtual_path,
     bool create) {
   switch (type) {
   case kFileSystemTypeTemporary:
   case kFileSystemTypePersistent:
-    return sandbox_provider_->GetFileSystemRootPathOnFileThread(
+    return sandbox_provider_->ValidateFileSystemRootAndGetPathOnFileThread(
         origin_url, type, virtual_path, create);
     break;
   case kFileSystemTypeExternal:
     return external_provider_.get() ?
-        external_provider_->GetFileSystemRootPathOnFileThread(
+        external_provider_->ValidateFileSystemRootAndGetPathOnFileThread(
            origin_url, type, virtual_path, create) :
         FilePath();
   case kFileSystemTypeUnknown:
   default:
     NOTREACHED();
     return FilePath();
   }
 }
 
 bool FileSystemPathManager::IsAllowedScheme(const GURL& url) const {
@@ skipping 57 matching lines @@
 }
 
 }  // namespace fileapi
 
 COMPILE_ASSERT(int(WebFileSystem::TypeTemporary) == \
                int(fileapi::kFileSystemTypeTemporary), mismatching_enums);
 COMPILE_ASSERT(int(WebFileSystem::TypePersistent) == \
                int(fileapi::kFileSystemTypePersistent), mismatching_enums);
 COMPILE_ASSERT(int(WebFileSystem::TypeExternal) == \
                int(fileapi::kFileSystemTypeExternal), mismatching_enums);