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

Side by Side Diff: components/drive/file_system_unittest.cc

Issue 2317993003: //chrome/browser and //components A-E: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Just rebased Created 4 years, 3 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
OLDNEW
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 "components/drive/chromeos/file_system.h" 5 #include "components/drive/chromeos/file_system.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 logger_.get(), 119 logger_.get(),
120 fake_drive_service_.get(), 120 fake_drive_service_.get(),
121 base::ThreadTaskRunnerHandle::Get().get())); 121 base::ThreadTaskRunnerHandle::Get().get()));
122 122
123 mock_directory_observer_.reset(new MockDirectoryChangeObserver); 123 mock_directory_observer_.reset(new MockDirectoryChangeObserver);
124 124
125 SetUpResourceMetadataAndFileSystem(); 125 SetUpResourceMetadataAndFileSystem();
126 } 126 }
127 127
128 void SetUpResourceMetadataAndFileSystem() { 128 void SetUpResourceMetadataAndFileSystem() {
129 const base::FilePath metadata_dir = temp_dir_.path().AppendASCII("meta"); 129 const base::FilePath metadata_dir = temp_dir_.GetPath().AppendASCII("meta");
130 ASSERT_TRUE(base::CreateDirectory(metadata_dir)); 130 ASSERT_TRUE(base::CreateDirectory(metadata_dir));
131 metadata_storage_.reset(new internal::ResourceMetadataStorage( 131 metadata_storage_.reset(new internal::ResourceMetadataStorage(
132 metadata_dir, base::ThreadTaskRunnerHandle::Get().get())); 132 metadata_dir, base::ThreadTaskRunnerHandle::Get().get()));
133 ASSERT_TRUE(metadata_storage_->Initialize()); 133 ASSERT_TRUE(metadata_storage_->Initialize());
134 134
135 const base::FilePath cache_dir = temp_dir_.path().AppendASCII("files"); 135 const base::FilePath cache_dir = temp_dir_.GetPath().AppendASCII("files");
136 ASSERT_TRUE(base::CreateDirectory(cache_dir)); 136 ASSERT_TRUE(base::CreateDirectory(cache_dir));
137 cache_.reset(new internal::FileCache( 137 cache_.reset(new internal::FileCache(
138 metadata_storage_.get(), 138 metadata_storage_.get(),
139 cache_dir, 139 cache_dir,
140 base::ThreadTaskRunnerHandle::Get().get(), 140 base::ThreadTaskRunnerHandle::Get().get(),
141 fake_free_disk_space_getter_.get())); 141 fake_free_disk_space_getter_.get()));
142 ASSERT_TRUE(cache_->Initialize()); 142 ASSERT_TRUE(cache_->Initialize());
143 143
144 resource_metadata_.reset(new internal::ResourceMetadata( 144 resource_metadata_.reset(new internal::ResourceMetadata(
145 metadata_storage_.get(), cache_.get(), 145 metadata_storage_.get(), cache_.get(),
146 base::ThreadTaskRunnerHandle::Get())); 146 base::ThreadTaskRunnerHandle::Get()));
147 ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize()); 147 ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize());
148 148
149 const base::FilePath temp_file_dir = temp_dir_.path().AppendASCII("tmp"); 149 const base::FilePath temp_file_dir = temp_dir_.GetPath().AppendASCII("tmp");
150 ASSERT_TRUE(base::CreateDirectory(temp_file_dir)); 150 ASSERT_TRUE(base::CreateDirectory(temp_file_dir));
151 file_task_runner_ = content::BrowserThread::GetTaskRunnerForThread( 151 file_task_runner_ = content::BrowserThread::GetTaskRunnerForThread(
152 content::BrowserThread::FILE); 152 content::BrowserThread::FILE);
153 file_system_.reset(new FileSystem( 153 file_system_.reset(new FileSystem(
154 pref_service_.get(), logger_.get(), cache_.get(), scheduler_.get(), 154 pref_service_.get(), logger_.get(), cache_.get(), scheduler_.get(),
155 resource_metadata_.get(), base::ThreadTaskRunnerHandle::Get().get(), 155 resource_metadata_.get(), base::ThreadTaskRunnerHandle::Get().get(),
156 file_task_runner_.get(), temp_file_dir)); 156 file_task_runner_.get(), temp_file_dir));
157 file_system_->AddObserver(mock_directory_observer_.get()); 157 file_system_->AddObserver(mock_directory_observer_.get());
158 158
159 // Disable delaying so that the sync starts immediately. 159 // Disable delaying so that the sync starts immediately.
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 219
220 // Sets up a filesystem with directories: drive/root, drive/root/Dir1, 220 // Sets up a filesystem with directories: drive/root, drive/root/Dir1,
221 // drive/root/Dir1/SubDir2 and files drive/root/File1, drive/root/Dir1/File2, 221 // drive/root/Dir1/SubDir2 and files drive/root/File1, drive/root/Dir1/File2,
222 // drive/root/Dir1/SubDir2/File3. If |use_up_to_date_timestamp| is true, sets 222 // drive/root/Dir1/SubDir2/File3. If |use_up_to_date_timestamp| is true, sets
223 // the changestamp to that of FakeDriveService, indicating the cache is 223 // the changestamp to that of FakeDriveService, indicating the cache is
224 // holding the latest file system info. 224 // holding the latest file system info.
225 void SetUpTestFileSystem(SetUpTestFileSystemParam param) { 225 void SetUpTestFileSystem(SetUpTestFileSystemParam param) {
226 // Destroy the existing resource metadata to close DB. 226 // Destroy the existing resource metadata to close DB.
227 resource_metadata_.reset(); 227 resource_metadata_.reset();
228 228
229 const base::FilePath metadata_dir = temp_dir_.path().AppendASCII("meta"); 229 const base::FilePath metadata_dir = temp_dir_.GetPath().AppendASCII("meta");
230 ASSERT_TRUE(base::CreateDirectory(metadata_dir)); 230 ASSERT_TRUE(base::CreateDirectory(metadata_dir));
231 std::unique_ptr<internal::ResourceMetadataStorage, 231 std::unique_ptr<internal::ResourceMetadataStorage,
232 test_util::DestroyHelperForTests> 232 test_util::DestroyHelperForTests>
233 metadata_storage(new internal::ResourceMetadataStorage( 233 metadata_storage(new internal::ResourceMetadataStorage(
234 metadata_dir, base::ThreadTaskRunnerHandle::Get().get())); 234 metadata_dir, base::ThreadTaskRunnerHandle::Get().get()));
235 235
236 const base::FilePath cache_dir = temp_dir_.path().AppendASCII("files"); 236 const base::FilePath cache_dir = temp_dir_.GetPath().AppendASCII("files");
237 std::unique_ptr<internal::FileCache, test_util::DestroyHelperForTests> 237 std::unique_ptr<internal::FileCache, test_util::DestroyHelperForTests>
238 cache(new internal::FileCache(metadata_storage.get(), cache_dir, 238 cache(new internal::FileCache(metadata_storage.get(), cache_dir,
239 base::ThreadTaskRunnerHandle::Get().get(), 239 base::ThreadTaskRunnerHandle::Get().get(),
240 fake_free_disk_space_getter_.get())); 240 fake_free_disk_space_getter_.get()));
241 241
242 std::unique_ptr<internal::ResourceMetadata, 242 std::unique_ptr<internal::ResourceMetadata,
243 test_util::DestroyHelperForTests> 243 test_util::DestroyHelperForTests>
244 resource_metadata(new internal::ResourceMetadata( 244 resource_metadata(new internal::ResourceMetadata(
245 metadata_storage_.get(), cache.get(), 245 metadata_storage_.get(), cache.get(),
246 base::ThreadTaskRunnerHandle::Get())); 246 base::ThreadTaskRunnerHandle::Get()));
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 google_apis::test_util::CreateCopyResultCallback(&available)); 1064 google_apis::test_util::CreateCopyResultCallback(&available));
1065 content::RunAllBlockingPoolTasksUntilIdle(); 1065 content::RunAllBlockingPoolTasksUntilIdle();
1066 ASSERT_FALSE(available); 1066 ASSERT_FALSE(available);
1067 1067
1068 entry = GetResourceEntrySync(file_in_root); 1068 entry = GetResourceEntrySync(file_in_root);
1069 ASSERT_TRUE(entry); 1069 ASSERT_TRUE(entry);
1070 EXPECT_FALSE(entry->file_specific_info().cache_state().is_present()); 1070 EXPECT_FALSE(entry->file_specific_info().cache_state().is_present());
1071 } 1071 }
1072 1072
1073 } // namespace drive 1073 } // namespace drive
OLDNEW
« no previous file with comments | « components/drive/file_system_core_util_unittest.cc ('k') | components/drive/file_write_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698