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

Side by Side Diff: webkit/fileapi/local_file_system_cross_operation_unittest.cc

Issue 12286020: Replace FilePath with base::FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <map> 5 #include <map>
6 #include <queue> 6 #include <queue>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 ~CrossOperationTestHelper() { 43 ~CrossOperationTestHelper() {
44 file_system_context_ = NULL; 44 file_system_context_ = NULL;
45 quota_manager_proxy_->SimulateQuotaManagerDestroyed(); 45 quota_manager_proxy_->SimulateQuotaManagerDestroyed();
46 quota_manager_ = NULL; 46 quota_manager_ = NULL;
47 quota_manager_proxy_ = NULL; 47 quota_manager_proxy_ = NULL;
48 MessageLoop::current()->RunUntilIdle(); 48 MessageLoop::current()->RunUntilIdle();
49 } 49 }
50 50
51 void SetUp() { 51 void SetUp() {
52 ASSERT_TRUE(base_.CreateUniqueTempDir()); 52 ASSERT_TRUE(base_.CreateUniqueTempDir());
53 FilePath base_dir = base_.path(); 53 base::FilePath base_dir = base_.path();
54 quota_manager_ = new quota::MockQuotaManager( 54 quota_manager_ = new quota::MockQuotaManager(
55 false /* is_incognito */, base_dir, 55 false /* is_incognito */, base_dir,
56 base::MessageLoopProxy::current(), 56 base::MessageLoopProxy::current(),
57 base::MessageLoopProxy::current(), 57 base::MessageLoopProxy::current(),
58 NULL /* special storage policy */); 58 NULL /* special storage policy */);
59 quota_manager_proxy_ = new quota::MockQuotaManagerProxy( 59 quota_manager_proxy_ = new quota::MockQuotaManagerProxy(
60 quota_manager_, 60 quota_manager_,
61 base::MessageLoopProxy::current()); 61 base::MessageLoopProxy::current());
62 file_system_context_ = new FileSystemContext( 62 file_system_context_ = new FileSystemContext(
63 FileSystemTaskRunners::CreateMockTaskRunners(), 63 FileSystemTaskRunners::CreateMockTaskRunners(),
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 } 95 }
96 96
97 int64 GetDestUsage() { 97 int64 GetDestUsage() {
98 int64 usage = 0; 98 int64 usage = 0;
99 GetUsageAndQuota(dest_type_, &usage, NULL); 99 GetUsageAndQuota(dest_type_, &usage, NULL);
100 return usage; 100 return usage;
101 } 101 }
102 102
103 FileSystemURL SourceURL(const std::string& path) { 103 FileSystemURL SourceURL(const std::string& path) {
104 return file_system_context_->CreateCrackedFileSystemURL( 104 return file_system_context_->CreateCrackedFileSystemURL(
105 origin_, src_type_, FilePath::FromUTF8Unsafe(path)); 105 origin_, src_type_, base::FilePath::FromUTF8Unsafe(path));
106 } 106 }
107 107
108 FileSystemURL DestURL(const std::string& path) { 108 FileSystemURL DestURL(const std::string& path) {
109 return file_system_context_->CreateCrackedFileSystemURL( 109 return file_system_context_->CreateCrackedFileSystemURL(
110 origin_, dest_type_, FilePath::FromUTF8Unsafe(path)); 110 origin_, dest_type_, base::FilePath::FromUTF8Unsafe(path));
111 } 111 }
112 112
113 base::PlatformFileError Copy(const FileSystemURL& src, 113 base::PlatformFileError Copy(const FileSystemURL& src,
114 const FileSystemURL& dest) { 114 const FileSystemURL& dest) {
115 return AsyncFileTestHelper::Copy(file_system_context_, src, dest); 115 return AsyncFileTestHelper::Copy(file_system_context_, src, dest);
116 } 116 }
117 117
118 base::PlatformFileError Move(const FileSystemURL& src, 118 base::PlatformFileError Move(const FileSystemURL& src,
119 const FileSystemURL& dest) { 119 const FileSystemURL& dest) {
120 return AsyncFileTestHelper::Move(file_system_context_, src, dest); 120 return AsyncFileTestHelper::Move(file_system_context_, src, dest);
(...skipping 18 matching lines...) Expand all
139 if (result != base::PLATFORM_FILE_OK) 139 if (result != base::PLATFORM_FILE_OK)
140 return result; 140 return result;
141 } 141 }
142 return result; 142 return result;
143 } 143 }
144 144
145 void VerifyTestCaseFiles( 145 void VerifyTestCaseFiles(
146 const FileSystemURL& root, 146 const FileSystemURL& root,
147 const test::TestCaseRecord* const test_cases, 147 const test::TestCaseRecord* const test_cases,
148 size_t test_case_size) { 148 size_t test_case_size) {
149 std::map<FilePath, const test::TestCaseRecord*> test_case_map; 149 std::map<base::FilePath, const test::TestCaseRecord*> test_case_map;
150 for (size_t i = 0; i < test_case_size; ++i) 150 for (size_t i = 0; i < test_case_size; ++i)
151 test_case_map[FilePath(test_cases[i].path).NormalizePathSeparators()] = 151 test_case_map[
152 &test_cases[i]; 152 base::FilePath(test_cases[i].path).NormalizePathSeparators()] =
153 &test_cases[i];
153 154
154 std::queue<FileSystemURL> directories; 155 std::queue<FileSystemURL> directories;
155 FileEntryList entries; 156 FileEntryList entries;
156 directories.push(root); 157 directories.push(root);
157 while (!directories.empty()) { 158 while (!directories.empty()) {
158 FileSystemURL dir = directories.front(); 159 FileSystemURL dir = directories.front();
159 directories.pop(); 160 directories.pop();
160 ASSERT_EQ(base::PLATFORM_FILE_OK, ReadDirectory(dir, &entries)); 161 ASSERT_EQ(base::PLATFORM_FILE_OK, ReadDirectory(dir, &entries));
161 for (size_t i = 0; i < entries.size(); ++i) { 162 for (size_t i = 0; i < entries.size(); ++i) {
162 FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL( 163 FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL(
163 dir.origin(), 164 dir.origin(),
164 dir.mount_type(), 165 dir.mount_type(),
165 dir.virtual_path().Append(entries[i].name)); 166 dir.virtual_path().Append(entries[i].name));
166 FilePath relative; 167 base::FilePath relative;
167 root.virtual_path().AppendRelativePath(url.virtual_path(), &relative); 168 root.virtual_path().AppendRelativePath(url.virtual_path(), &relative);
168 relative = relative.NormalizePathSeparators(); 169 relative = relative.NormalizePathSeparators();
169 ASSERT_TRUE(ContainsKey(test_case_map, relative)); 170 ASSERT_TRUE(ContainsKey(test_case_map, relative));
170 if (entries[i].is_directory) { 171 if (entries[i].is_directory) {
171 EXPECT_TRUE(test_case_map[relative]->is_directory); 172 EXPECT_TRUE(test_case_map[relative]->is_directory);
172 directories.push(url); 173 directories.push(url);
173 } else { 174 } else {
174 EXPECT_FALSE(test_case_map[relative]->is_directory); 175 EXPECT_FALSE(test_case_map[relative]->is_directory);
175 EXPECT_TRUE(FileExists(url, test_case_map[relative]->data_file_size)); 176 EXPECT_TRUE(FileExists(url, test_case_map[relative]->data_file_size));
176 } 177 }
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 test::kRegularTestCaseSize); 416 test::kRegularTestCaseSize);
416 417
417 int64 src_new_usage = helper.GetSourceUsage(); 418 int64 src_new_usage = helper.GetSourceUsage();
418 ASSERT_EQ(src_initial_usage, src_new_usage); 419 ASSERT_EQ(src_initial_usage, src_new_usage);
419 420
420 int64 dest_increase = helper.GetDestUsage() - dest_initial_usage; 421 int64 dest_increase = helper.GetDestUsage() - dest_initial_usage;
421 ASSERT_EQ(src_increase, dest_increase); 422 ASSERT_EQ(src_increase, dest_increase);
422 } 423 }
423 424
424 } // namespace fileapi 425 } // namespace fileapi
OLDNEW
« no previous file with comments | « webkit/fileapi/isolated_file_util_unittest.cc ('k') | webkit/fileapi/media/device_media_async_file_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698