New FileSystemURL cracking

webkit/fileapi/local_file_system_test_helper.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 "webkit/fileapi/local_file_system_test_helper.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "googleurl/src/gurl.h"
@@ skipping 34 matching lines @@
 void LocalFileSystemTestOriginHelper::SetUp(
     FileSystemContext* file_system_context, FileSystemFileUtil* file_util) {
   file_util_ = file_util;
   file_system_context_ = file_system_context;
   if (!file_util_)
     file_util_ = file_system_context->GetFileUtil(type_);
   DCHECK(file_util_);
 
   // Prepare the origin's root directory.
   file_system_context_->GetMountPointProvider(type_)->
-      GetFileSystemRootPathOnFileThread(
-          FileSystemURL(origin_, type_, FilePath()), true /* create */);
+      GetFileSystemRootPathOnFileThread(CreateURL(FilePath()),
+                                        true /* create */);
 
   // Initialize the usage cache file.
   FilePath usage_cache_path = GetUsageCachePath();
   if (!usage_cache_path.empty())
     FileSystemUsageCache::UpdateUsage(usage_cache_path, 0);
 }
 
 void LocalFileSystemTestOriginHelper::SetUp(
     const FilePath& base_dir,
     bool unlimited_quota,
@@ skipping 13 matching lines @@
     file_system_context_->RegisterMountPointProvider(
         type_,
         new TestMountPointProvider(
             file_system_context_->task_runners()->file_task_runner(),
             base_dir));
   }
 
   // Prepare the origin's root directory.
   FileSystemMountPointProvider* mount_point_provider =
       file_system_context_->GetMountPointProvider(type_);
-  mount_point_provider->GetFileSystemRootPathOnFileThread(
-     FileSystemURL(origin_, type_, FilePath()), true /* create */);
+  mount_point_provider->GetFileSystemRootPathOnFileThread(CreateURL(FilePath()),
+                                                          true /* create */);
 
   if (file_util)
     file_util_ = file_util;
   else
     file_util_ = mount_point_provider->GetFileUtil(type_);
 
   DCHECK(file_util_);
 
   // Initialize the usage cache file.
   FilePath usage_cache_path = GetUsageCachePath();
   if (!usage_cache_path.empty())
     FileSystemUsageCache::UpdateUsage(usage_cache_path, 0);
 }
 
 void LocalFileSystemTestOriginHelper::TearDown() {
   file_system_context_ = NULL;
   MessageLoop::current()->RunUntilIdle();
 }
 
 FilePath LocalFileSystemTestOriginHelper::GetOriginRootPath() const {
   return file_system_context_->GetMountPointProvider(type_)->
-      GetFileSystemRootPathOnFileThread(
-          FileSystemURL(origin_, type_, FilePath()), false);
+      GetFileSystemRootPathOnFileThread(CreateURL(FilePath()), false);
 }
 
 FilePath LocalFileSystemTestOriginHelper::GetLocalPath(const FilePath& path) {
   DCHECK(file_util_);
   FilePath local_path;
   scoped_ptr<FileSystemOperationContext> context(NewOperationContext());
   file_util_->GetLocalFilePath(context.get(), CreateURL(path), &local_path);
   return local_path;
 }
 
 FilePath LocalFileSystemTestOriginHelper::GetLocalPathFromASCII(
     const std::string& path) {
   return GetLocalPath(FilePath().AppendASCII(path));
 }
 
 FilePath LocalFileSystemTestOriginHelper::GetUsageCachePath() const {
   if (type_ != kFileSystemTypeTemporary &&
       type_ != kFileSystemTypePersistent)
     return FilePath();
   return file_system_context_->
       sandbox_provider()->GetUsageCachePathForOriginAndType(origin_, type_);
 }
 
 FileSystemURL LocalFileSystemTestOriginHelper::CreateURL(const FilePath& path)
     const {
-  return FileSystemURL(origin_, type_, path);
+  return file_system_context_->CreateCrackedFileSystemURL(origin_, type_, path);
 }
 
 base::PlatformFileError LocalFileSystemTestOriginHelper::SameFileUtilCopy(
     FileSystemOperationContext* context,
     const FileSystemURL& src,
     const FileSystemURL& dest) const {
   return FileUtilHelper::Copy(context, file_util(), file_util(), src, dest);
 }
 
 base::PlatformFileError LocalFileSystemTestOriginHelper::SameFileUtilMove(
@@ skipping 37 matching lines @@
 LocalFileSystemTestOriginHelper::NewOperationContext() {
   DCHECK(file_system_context_.get());
   FileSystemOperationContext* context =
     new FileSystemOperationContext(file_system_context_.get());
   context->set_update_observers(
       *file_system_context_->GetUpdateObservers(type_));
   return context;
 }
 
 }  // namespace fileapi