Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(825)

Unified Diff: webkit/fileapi/syncable/syncable_file_system_util_unittest.cc

Issue 12163003: Add FilePath to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/fileapi/syncable/syncable_file_system_util.cc ('k') | webkit/fileapi/test_file_set.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/syncable/syncable_file_system_util_unittest.cc
diff --git a/webkit/fileapi/syncable/syncable_file_system_util_unittest.cc b/webkit/fileapi/syncable/syncable_file_system_util_unittest.cc
index 91b0baab3ecc6348d8babd8c76b0e92a669325b5..6e8dcc0c1f3f3cd8c8b2cd510a67a04719099862 100644
--- a/webkit/fileapi/syncable/syncable_file_system_util_unittest.cc
+++ b/webkit/fileapi/syncable/syncable_file_system_util_unittest.cc
@@ -25,14 +25,14 @@ const char kNonSyncableFileSystemRootURI[] =
const char kOrigin[] = "http://www.example.com/";
const char kServiceName[] = "service";
-const FilePath::CharType kPath[] = FILE_PATH_LITERAL("dir/file");
+const base::FilePath::CharType kPath[] = FILE_PATH_LITERAL("dir/file");
FileSystemURL CreateFileSystemURL(const std::string& url) {
return ExternalMountPoints::GetSystemInstance()->CrackURL(GURL(url));
}
-FilePath CreateNormalizedFilePath(const FilePath::CharType* path) {
- return FilePath(path).NormalizePathSeparators();
+base::FilePath CreateNormalizedFilePath(const base::FilePath::CharType* path) {
+ return base::FilePath(path).NormalizePathSeparators();
}
} // namespace
@@ -45,9 +45,9 @@ TEST(SyncableFileSystemUtilTest, GetSyncableFileSystemRootURI) {
TEST(SyncableFileSystemUtilTest, CreateSyncableFileSystemURL) {
ScopedExternalFileSystem scoped_fs(
- kServiceName, kFileSystemTypeSyncable, FilePath());
+ kServiceName, kFileSystemTypeSyncable, base::FilePath());
- const FilePath path(kPath);
+ const base::FilePath path(kPath);
const FileSystemURL expected_url =
CreateFileSystemURL(kSyncableFileSystemRootURI + path.AsUTF8Unsafe());
const FileSystemURL url =
@@ -60,13 +60,13 @@ TEST(SyncableFileSystemUtilTest, CreateSyncableFileSystemURL) {
TEST(SyncableFileSystemUtilTest,
SerializeAndDesirializeSyncableFileSystemURL) {
ScopedExternalFileSystem scoped_fs(
- kServiceName, kFileSystemTypeSyncable, FilePath());
+ kServiceName, kFileSystemTypeSyncable, base::FilePath());
const std::string expected_url_str = kSyncableFileSystemRootURI +
CreateNormalizedFilePath(kPath).AsUTF8Unsafe();
const FileSystemURL expected_url = CreateFileSystemURL(expected_url_str);
const FileSystemURL url =
- CreateSyncableFileSystemURL(GURL(kOrigin), kServiceName, FilePath(kPath));
+ CreateSyncableFileSystemURL(GURL(kOrigin), kServiceName, base::FilePath(kPath));
std::string serialized;
EXPECT_TRUE(SerializeSyncableFileSystemURL(url, &serialized));
@@ -81,9 +81,9 @@ TEST(SyncableFileSystemUtilTest,
TEST(SyncableFileSystemUtilTest,
FailInSerializingAndDeserializingSyncableFileSystemURL) {
ScopedExternalFileSystem scoped_fs(
- kServiceName, kFileSystemTypeSyncable, FilePath());
+ kServiceName, kFileSystemTypeSyncable, base::FilePath());
- const FilePath normalized_path = CreateNormalizedFilePath(kPath);
+ const base::FilePath normalized_path = CreateNormalizedFilePath(kPath);
const std::string non_registered_url =
kNonRegisteredFileSystemRootURI + normalized_path.AsUTF8Unsafe();
const std::string non_syncable_url =
« no previous file with comments | « webkit/fileapi/syncable/syncable_file_system_util.cc ('k') | webkit/fileapi/test_file_set.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698