Fix module dependency in file_system_url*

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/files/file_path.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
-#include "webkit/browser/fileapi/isolated_context.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.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) {
   FileSystemURL url = FileSystemURL::CreateForTest(GURL(url_string));
-  switch (url.type()) {
-    case kFileSystemTypeExternal:
-      return ExternalMountPoints::GetSystemInstance()->
-          CreateCrackedFileSystemURL(url.origin(), url.type(), url.path());
-    case kFileSystemTypeIsolated:
-      return IsolatedContext::GetInstance()->CreateCrackedFileSystemURL(
-          url.origin(), url.type(), url.path());
-    default:
-      return url;
-  }
-}
-
-FileSystemURL CreateExternalFileSystemURL(const GURL& origin,
-                                          FileSystemType type,
-                                          const base::FilePath& path) {
-  return ExternalMountPoints::GetSystemInstance()->CreateCrackedFileSystemURL(
-      origin, type, path);
+  EXPECT_TRUE(url.type() != kFileSystemTypeExternal &&
+              url.type() != kFileSystemTypeIsolated);
+  return url;
 }
 
 std::string NormalizedUTF8Path(const base::FilePath& path) {
   return path.NormalizePathSeparators().AsUTF8Unsafe();
 }
 
 }  // namespace
 
 TEST(FileSystemURLTest, ParsePersistent) {
   FileSystemURL url = CreateFileSystemURL(
@@ skipping 75 matching lines @@
 
   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, IsParent) {
-  ScopedExternalFileSystem scoped1("foo", kFileSystemTypeSyncable,
-                                   base::FilePath());
-  ScopedExternalFileSystem scoped2("bar", kFileSystemTypeSyncable,
-                                   base::FilePath());
-
   const std::string root1 = GetFileSystemRootURI(
       GURL("http://example.com"), kFileSystemTypeTemporary).spec();
-  const std::string root2 = sync_file_system::GetSyncableFileSystemRootURI(
-      GURL("http://example.com"), "foo").spec();
-  const std::string root3 = sync_file_system::GetSyncableFileSystemRootURI(
-      GURL("http://example.com"), "bar").spec();
-  const std::string root4 = GetFileSystemRootURI(
+  const std::string root2 = GetFileSystemRootURI(
+      GURL("http://example.com"), kFileSystemTypePersistent).spec();
+  const std::string root3 = GetFileSystemRootURI(
       GURL("http://chromium.org"), kFileSystemTypeTemporary).spec();
 
   const std::string parent("dir");
   const std::string child("dir/child");
   const std::string other("other");
 
   // True cases.
   EXPECT_TRUE(CreateFileSystemURL(root1 + parent).IsParent(
       CreateFileSystemURL(root1 + child)));
   EXPECT_TRUE(CreateFileSystemURL(root2 + parent).IsParent(
       CreateFileSystemURL(root2 + child)));
 
   // False cases: the path is not a child.
   EXPECT_FALSE(CreateFileSystemURL(root1 + parent).IsParent(
       CreateFileSystemURL(root1 + other)));
   EXPECT_FALSE(CreateFileSystemURL(root1 + parent).IsParent(
       CreateFileSystemURL(root1 + parent)));
   EXPECT_FALSE(CreateFileSystemURL(root1 + child).IsParent(
       CreateFileSystemURL(root1 + parent)));
 
   // False case: different types.
   EXPECT_FALSE(CreateFileSystemURL(root1 + parent).IsParent(
       CreateFileSystemURL(root2 + child)));
 
-  // False case: different filesystem ID.
+  // False case: different origins.
   EXPECT_FALSE(CreateFileSystemURL(root1 + parent).IsParent(
       CreateFileSystemURL(root3 + child)));
-
-  // False case: different origins.
-  EXPECT_FALSE(CreateFileSystemURL(root1 + parent).IsParent(
-      CreateFileSystemURL(root4 + child)));
 }
 
 TEST(FileSystemURLTest, DebugString) {
   const GURL kOrigin("http://example.com");
   const base::FilePath kPath(FPL("dir/file"));
 
   const FileSystemURL kURL1 = FileSystemURL::CreateForTest(
       kOrigin, kFileSystemTypeTemporary, kPath);
   EXPECT_EQ("filesystem:http://example.com/temporary/" +
             NormalizedUTF8Path(kPath),
             kURL1.DebugString());
-
-  const base::FilePath kRoot(DRIVE FPL("/root"));
-  ScopedExternalFileSystem scoped_fs("foo",
-                                     kFileSystemTypeNativeLocal,
-                                     kRoot.NormalizePathSeparators());
-  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