chrome/browser/sync_file_system/local_sync_operation_resolver.h - Issue 14851005: SyncFS: Fix LocalSyncOperationResolverTest to cover all test cases

Unified Diff: chrome/browser/sync_file_system/local_sync_operation_resolver.h

Issue 14851005: SyncFS: Fix LocalSyncOperationResolverTest to cover all test cases (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review fix Created 7 years, 7 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_file_system/drive_file_sync_service.cc ('k') | chrome/browser/sync_file_system/local_sync_operation_resolver.cc » ('j') | chrome/browser/sync_file_system/local_sync_operation_resolver_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/local_sync_operation_resolver.h

diff --git a/chrome/browser/sync_file_system/local_sync_operation_resolver.h b/chrome/browser/sync_file_system/local_sync_operation_resolver.h

index 8a59aca630922f7fc08d8618aaf91ab4676e8736..c944f02620b012c29934f3db8863ef1ed13c22c4 100644

--- a/chrome/browser/sync_file_system/local_sync_operation_resolver.h

+++ b/chrome/browser/sync_file_system/local_sync_operation_resolver.h

@@ -32,39 +32,29 @@ class LocalSyncOperationResolver {

public:

static LocalSyncOperationType Resolve(

kinuko 2013/05/07 11:20:16 Can you comment about parameters? // |remote_file

nhiroki 2013/05/07 12:20:25 Done.

const FileChange& local_file_change,

- bool has_remote_change,

- const FileChange& remote_file_change,

+ FileChange* remote_file_change,

kinuko 2013/05/07 11:20:16 Can this be const pointer?

nhiroki 2013/05/07 12:20:25 Done.

DriveMetadata* drive_metadata);

kinuko 2013/05/07 11:20:16 ditto

nhiroki 2013/05/07 12:20:25 Done.

private:

static LocalSyncOperationType ResolveForAddOrUpdateFile(

- bool has_remote_change,

- const FileChange& remote_file_change,

+ FileChange* remote_file_change,

SyncFileType remote_file_type_in_metadata);

static LocalSyncOperationType ResolveForAddOrUpdateFileInConflict(

- bool has_remote_change,

- const FileChange& remote_file_change);

+ FileChange* remote_file_change);

static LocalSyncOperationType ResolveForAddDirectory(

- bool has_remote_change,

- const FileChange& remote_file_change,

+ FileChange* remote_file_change,

SyncFileType remote_file_type_in_metadata);

- static LocalSyncOperationType ResolveForAddDirectoryInConflict(

- bool has_remote_change,

- const FileChange& remote_file_change);

+ static LocalSyncOperationType ResolveForAddDirectoryInConflict();

static LocalSyncOperationType ResolveForDeleteFile(

- bool has_remote_change,

- const FileChange& remote_file_change,

+ FileChange* remote_file_change,

SyncFileType remote_file_type_in_metadata);

static LocalSyncOperationType ResolveForDeleteFileInConflict(

- bool has_remote_change,

- const FileChange& remote_file_change);

+ FileChange* remote_file_change);

static LocalSyncOperationType ResolveForDeleteDirectory(

- bool has_remote_change,

- const FileChange& remote_file_change,

+ FileChange* remote_file_change,

SyncFileType remote_file_type_in_metadata);

static LocalSyncOperationType ResolveForDeleteDirectoryInConflict(

- bool has_remote_change,

- const FileChange& remote_file_change);

+ FileChange* remote_file_change);

FRIEND_TEST_ALL_PREFIXES(LocalSyncOperationResolverTest,

ResolveForAddOrUpdateFile);