chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc - Issue 2317023003: sync and signin: Change ScopedTempDir::path() to GetPath()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync_file_system/drive_backend/conflict_resolver_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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.cc ('k') | chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

index 6fe22dadec2286f894fd540567a8fbb8cd32dde8..99d194dfd620fbf20e5e97a69f800139758a38b7 100644

--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

@@ -96,10 +96,8 @@ class ConflictResolverTest : public testing::Test {

}

void InitializeMetadataDatabase() {

- SyncEngineInitializer* initializer =

- new SyncEngineInitializer(context_.get(),

- database_dir_.path(),

- in_memory_env_.get());

+ SyncEngineInitializer* initializer = new SyncEngineInitializer(

+ context_.get(), database_dir_.GetPath(), in_memory_env_.get());

SyncStatusCode status = SYNC_STATUS_UNKNOWN;

sync_task_manager_->ScheduleSyncTask(

FROM_HERE, std::unique_ptr<SyncTask>(initializer),

@@ -192,7 +190,7 @@ class ConflictResolverTest : public testing::Test {

SyncStatusCode status = SYNC_STATUS_UNKNOWN;

base::FilePath local_path = base::FilePath(FILE_PATH_LITERAL("dummy"));

if (file_change.IsAddOrUpdate())

- CreateTemporaryFileInDir(database_dir_.path(), &local_path);

+ CreateTemporaryFileInDir(database_dir_.GetPath(), &local_path);

std::unique_ptr<LocalToRemoteSyncer> syncer(new LocalToRemoteSyncer(

context_.get(),

SyncFileMetadata(file_change.file_type(), 0, base::Time()), file_change,