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

Side by Side Diff: chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc

Issue 2317023003: sync and signin: 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/threading/thread_task_runner_handle.h" 9 #include "base/threading/thread_task_runner_handle.h"
10 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h" 10 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 in_memory_env_.get(), 43 in_memory_env_.get(),
44 base::ThreadTaskRunnerHandle::Get().get(), 44 base::ThreadTaskRunnerHandle::Get().get(),
45 base::ThreadTaskRunnerHandle::Get().get()), 45 base::ThreadTaskRunnerHandle::Get().get()),
46 weak_factory_(this) {} 46 weak_factory_(this) {}
47 47
48 void SetUp() override { 48 void SetUp() override {
49 ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); 49 ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
50 file_system_.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED); 50 file_system_.SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
51 51
52 sync_context_ = 52 sync_context_ =
53 new LocalFileSyncContext(data_dir_.path(), 53 new LocalFileSyncContext(data_dir_.GetPath(), in_memory_env_.get(),
54 in_memory_env_.get(),
55 base::ThreadTaskRunnerHandle::Get().get(), 54 base::ThreadTaskRunnerHandle::Get().get(),
56 base::ThreadTaskRunnerHandle::Get().get()); 55 base::ThreadTaskRunnerHandle::Get().get());
57 ASSERT_EQ( 56 ASSERT_EQ(
58 sync_file_system::SYNC_STATUS_OK, 57 sync_file_system::SYNC_STATUS_OK,
59 file_system_.MaybeInitializeFileSystemContext(sync_context_.get())); 58 file_system_.MaybeInitializeFileSystemContext(sync_context_.get()));
60 } 59 }
61 60
62 void TearDown() override { 61 void TearDown() override {
63 if (sync_context_.get()) 62 if (sync_context_.get())
64 sync_context_->ShutdownOnUIThread(); 63 sync_context_->ShutdownOnUIThread();
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 sync_file_system::SYNC_FILE_TYPE_DIRECTORY)); 244 sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
246 VerifyAndClearChange(URL(kPath1), 245 VerifyAndClearChange(URL(kPath1),
247 FileChange(FileChange::FILE_CHANGE_DELETE, 246 FileChange(FileChange::FILE_CHANGE_DELETE,
248 sync_file_system::SYNC_FILE_TYPE_DIRECTORY)); 247 sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
249 VerifyAndClearChange(URL(kPath2), 248 VerifyAndClearChange(URL(kPath2),
250 FileChange(FileChange::FILE_CHANGE_DELETE, 249 FileChange(FileChange::FILE_CHANGE_DELETE,
251 sync_file_system::SYNC_FILE_TYPE_FILE)); 250 sync_file_system::SYNC_FILE_TYPE_FILE));
252 } 251 }
253 252
254 } // namespace sync_file_system 253 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698