OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/fileapi/syncable/syncable_file_system_util.h" | 5 #include "webkit/fileapi/syncable/syncable_file_system_util.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/message_loop_proxy.h" | 9 #include "base/message_loop_proxy.h" |
10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 const char kNonRegisteredFileSystemRootURI[] = | 21 const char kNonRegisteredFileSystemRootURI[] = |
22 "filesystem:http://www.example.com/external/non_registered/"; | 22 "filesystem:http://www.example.com/external/non_registered/"; |
23 const char kNonSyncableFileSystemRootURI[] = | 23 const char kNonSyncableFileSystemRootURI[] = |
24 "filesystem:http://www.example.com/temporary/"; | 24 "filesystem:http://www.example.com/temporary/"; |
25 | 25 |
26 const char kOrigin[] = "http://www.example.com/"; | 26 const char kOrigin[] = "http://www.example.com/"; |
27 const char kServiceName[] = "service"; | 27 const char kServiceName[] = "service"; |
28 const FilePath::CharType kPath[] = FILE_PATH_LITERAL("dir/file"); | 28 const FilePath::CharType kPath[] = FILE_PATH_LITERAL("dir/file"); |
29 | 29 |
30 FileSystemURL CreateFileSystemURL(const std::string& url) { | 30 FileSystemURL CreateFileSystemURL(const std::string& url) { |
31 return FileSystemURL(GURL(url)); | 31 return ExternalMountPoints::GetSystemInstance()->CrackURL(GURL(url)); |
32 } | 32 } |
33 | 33 |
34 FilePath CreateNormalizedFilePath(const FilePath::CharType* path) { | 34 FilePath CreateNormalizedFilePath(const FilePath::CharType* path) { |
35 return FilePath(path).NormalizePathSeparators(); | 35 return FilePath(path).NormalizePathSeparators(); |
36 } | 36 } |
37 | 37 |
38 } // namespace | 38 } // namespace |
39 | 39 |
40 TEST(SyncableFileSystemUtilTest, GetSyncableFileSystemRootURI) { | 40 TEST(SyncableFileSystemUtilTest, GetSyncableFileSystemRootURI) { |
41 const GURL root = GetSyncableFileSystemRootURI(GURL(kOrigin), kServiceName); | 41 const GURL root = GetSyncableFileSystemRootURI(GURL(kOrigin), kServiceName); |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 | 136 |
137 // Shutting down. | 137 // Shutting down. |
138 file_system.TearDown(); | 138 file_system.TearDown(); |
139 RevokeSyncableFileSystem(kServiceName); | 139 RevokeSyncableFileSystem(kServiceName); |
140 sync_context->ShutdownOnUIThread(); | 140 sync_context->ShutdownOnUIThread(); |
141 sync_context = NULL; | 141 sync_context = NULL; |
142 MessageLoop::current()->RunUntilIdle(); | 142 MessageLoop::current()->RunUntilIdle(); |
143 } | 143 } |
144 | 144 |
145 } // namespace fileapi | 145 } // namespace fileapi |
OLD | NEW |