New FileSystemURL cracking

webkit/fileapi/file_system_url_unittest.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/file_system_url.h"
 
 #include "base/file_path.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
 
 #define FPL FILE_PATH_LITERAL
 
 #if defined(FILE_PATH_USES_DRIVE_LETTERS)
 #define DRIVE FPL("C:")
 #else
 #define DRIVE FPL("/a/")
 #endif
 
 namespace fileapi {
 
 namespace {
 
 FileSystemURL CreateFileSystemURL(const std::string& url_string) {
-  return FileSystemURL(GURL(url_string));
+  FileSystemURL url = FileSystemURL::CreateForTest(GURL(url_string));
+  switch (url.type()) {
+    case kFileSystemTypeExternal:
+      return ExternalMountPoints::GetSystemInstance()->CrackFileSystemURL(url);
+    case kFileSystemTypeIsolated:
+      return IsolatedContext::GetInstance()->CrackFileSystemURL(url);
+    default:
+      return url;
+  }
+}
+
+FileSystemURL CreateExternalFileSystemURL(const GURL& origin,
+                                          FileSystemType type,
+                                          const FilePath& path) {
+  return ExternalMountPoints::GetSystemInstance()->CreateCrackedFileSystemURL(
+      origin, type, path);
 }
 
 std::string NormalizedUTF8Path(const FilePath& path) {
   return path.NormalizePathSeparators().AsUTF8Unsafe();
 }
 
 }  // namespace
 
 TEST(FileSystemURLTest, ParsePersistent) {
   FileSystemURL url = CreateFileSystemURL(
@@ skipping 61 matching lines @@
       GURL("filesystem:http://chromium.org/temporary/dir aa/file b"),
       GURL("filesystem:http://chromium.com/temporary/dir a/file a"),
       GURL("filesystem:https://chromium.org/temporary/dir a/file a")
   };
 
   FileSystemURL::Comparator compare;
   for (size_t i = 0; i < arraysize(urls); ++i) {
     for (size_t j = 0; j < arraysize(urls); ++j) {
       SCOPED_TRACE(testing::Message() << i << " < " << j);
       EXPECT_EQ(urls[i] < urls[j],
-                compare(FileSystemURL(urls[i]), FileSystemURL(urls[j])));
+                compare(FileSystemURL::CreateForTest(urls[i]),
+                        FileSystemURL::CreateForTest(urls[j])));
     }
   }
 
   const FileSystemURL a = CreateFileSystemURL(
       "filesystem:http://chromium.org/temporary/dir a/file a");
   const FileSystemURL b = CreateFileSystemURL(
       "filesystem:http://chromium.org/persistent/dir a/file a");
   EXPECT_EQ(a.type() < b.type(), compare(a, b));
   EXPECT_EQ(b.type() < a.type(), compare(b, a));
 }
 
 TEST(FileSystemURLTest, WithPath) {
   const GURL kURL("filesystem:http://chromium.org/temporary/dir");
   const FilePath::StringType paths[] = {
       FPL("dir a"),
       FPL("dir a/file 1"),
       FPL("dir a/dir b"),
       FPL("dir a/dir b/file 2"),
   };
 
-  const FileSystemURL base = FileSystemURL(kURL);
+  const FileSystemURL base = FileSystemURL::CreateForTest(kURL);
   for (size_t i = 0; i < arraysize(paths); ++i) {
     const FileSystemURL url = base.WithPath(FilePath(paths[i]));
     EXPECT_EQ(paths[i], url.path().value());
     EXPECT_EQ(base.origin().spec(), url.origin().spec());
     EXPECT_EQ(base.type(), url.type());
     EXPECT_EQ(base.mount_type(), url.mount_type());
     EXPECT_EQ(base.filesystem_id(), url.filesystem_id());
   }
 }
 
 TEST(FileSystemURLTest, WithPathForExternal) {
   const std::string kId = "foo";
   ScopedExternalFileSystem scoped_fs(kId, kFileSystemTypeSyncable, FilePath());
   const FilePath kVirtualRoot = scoped_fs.GetVirtualRootPath();
 
   const FilePath::CharType kBasePath[] = FPL("dir");
   const FilePath::StringType paths[] = {
       FPL("dir a"),
       FPL("dir a/file 1"),
       FPL("dir a/dir b"),
       FPL("dir a/dir b/file 2"),
   };
 
-  const FileSystemURL base = FileSystemURL(
+  const FileSystemURL base = FileSystemURL::CreateForTest(
       GURL("http://example.com/"),
       kFileSystemTypeExternal,
       kVirtualRoot.Append(kBasePath));
 
   for (size_t i = 0; i < arraysize(paths); ++i) {
     const FileSystemURL url = base.WithPath(FilePath(paths[i]));
     EXPECT_EQ(paths[i], url.path().value());
     EXPECT_EQ(base.origin().spec(), url.origin().spec());
     EXPECT_EQ(base.type(), url.type());
     EXPECT_EQ(base.mount_type(), url.mount_type());
@@ skipping 42 matching lines @@
 
   // False case: different origins.
   EXPECT_FALSE(CreateFileSystemURL(root1 + parent).IsParent(
       CreateFileSystemURL(root4 + child)));
 }
 
 TEST(FileSystemURLTest, DebugString) {
   const GURL kOrigin("http://example.com");
   const FilePath kPath(FPL("dir/file"));
 
-  const FileSystemURL kURL1(kOrigin, kFileSystemTypeTemporary, kPath);
+  const FileSystemURL kURL1 = FileSystemURL::CreateForTest(
+      kOrigin, kFileSystemTypeTemporary, kPath);
   EXPECT_EQ("filesystem:http://example.com/temporary/" +
             NormalizedUTF8Path(kPath),
             kURL1.DebugString());
 
   const FilePath kRoot(DRIVE FPL("/root"));
   ScopedExternalFileSystem scoped_fs("foo",
                                      kFileSystemTypeNativeLocal,
                                      kRoot.NormalizePathSeparators());
-  const FileSystemURL kURL2(kOrigin, kFileSystemTypeExternal,
-                            scoped_fs.GetVirtualRootPath().Append(kPath));
+  const FileSystemURL kURL2(CreateExternalFileSystemURL(
+      kOrigin,
+      kFileSystemTypeExternal,
+      scoped_fs.GetVirtualRootPath().Append(kPath)));
   EXPECT_EQ("filesystem:http://example.com/external/" +
             NormalizedUTF8Path(scoped_fs.GetVirtualRootPath().Append(kPath)) +
             " (NativeLocal@foo:" +
             NormalizedUTF8Path(kRoot.Append(kPath)) + ")",
             kURL2.DebugString());
 }
 
 }  // namespace fileapi