Move storage-related files from webkit/ to new top-level directory storage/

content/common/fileapi/file_system_util_unittest.cc

 // Copyright 2014 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/common/fileapi/file_system_util.h"
+#include "storage/common/fileapi/file_system_util.h"
 
 #include "base/files/file_path.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-using fileapi::CrackIsolatedFileSystemName;
-using fileapi::GetExternalFileSystemRootURIString;
-using fileapi::GetIsolatedFileSystemName;
-using fileapi::GetIsolatedFileSystemRootURIString;
-using fileapi::ValidateIsolatedFileSystemId;
-using fileapi::VirtualPath;
+using storage::CrackIsolatedFileSystemName;
+using storage::GetExternalFileSystemRootURIString;
+using storage::GetIsolatedFileSystemName;
+using storage::GetIsolatedFileSystemRootURIString;
+using storage::ValidateIsolatedFileSystemId;
+using storage::VirtualPath;
 
 namespace content {
 namespace {
 
 class FileSystemUtilTest : public testing::Test {};
 
 TEST_F(FileSystemUtilTest, ParseFileSystemSchemeURL) {
   GURL uri("filesystem:http://chromium.org/temporary/foo/bar");
   GURL origin_url;
-  fileapi::FileSystemType type;
+  storage::FileSystemType type;
   base::FilePath virtual_path;
   ParseFileSystemSchemeURL(uri, &origin_url, &type, &virtual_path);
   EXPECT_EQ(GURL("http://chromium.org"), origin_url);
-  EXPECT_EQ(fileapi::kFileSystemTypeTemporary, type);
+  EXPECT_EQ(storage::kFileSystemTypeTemporary, type);
 #if defined(FILE_PATH_USES_WIN_SEPARATORS)
   base::FilePath expected_path(FILE_PATH_LITERAL("foo\\bar"));
 #else
   base::FilePath expected_path(FILE_PATH_LITERAL("foo/bar"));
 #endif
   EXPECT_EQ(expected_path, virtual_path);
 }
 
 TEST_F(FileSystemUtilTest, GetTempFileSystemRootURI) {
   GURL origin_url("http://chromium.org");
-  fileapi::FileSystemType type = fileapi::kFileSystemTypeTemporary;
+  storage::FileSystemType type = storage::kFileSystemTypeTemporary;
   GURL uri = GURL("filesystem:http://chromium.org/temporary/");
   EXPECT_EQ(uri, GetFileSystemRootURI(origin_url, type));
 }
 
 TEST_F(FileSystemUtilTest, GetPersistentFileSystemRootURI) {
   GURL origin_url("http://chromium.org");
-  fileapi::FileSystemType type = fileapi::kFileSystemTypePersistent;
+  storage::FileSystemType type = storage::kFileSystemTypePersistent;
   GURL uri = GURL("filesystem:http://chromium.org/persistent/");
   EXPECT_EQ(uri, GetFileSystemRootURI(origin_url, type));
 }
 
 TEST_F(FileSystemUtilTest, VirtualPathBaseName) {
   struct test_data {
     const base::FilePath::StringType path;
     const base::FilePath::StringType base_name;
   } test_cases[] = {
     { FILE_PATH_LITERAL("foo/bar"), FILE_PATH_LITERAL("bar") },
@@ skipping 239 matching lines @@
   // Percents must be escaped, otherwise they will be unintentionally unescaped.
   const std::string kMountName = "X%20Y";
 
   const std::string url_string =
       GetExternalFileSystemRootURIString(kOriginURL, kMountName);
   EXPECT_EQ("filesystem:http://foo/external/X%2520Y/", url_string);
 }
 
 }  // namespace
 }  // namespace content