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

Issues Search
    My Issues | Starred     Open | Closed | All

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

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/local_sync_operation_resolver.h ('k') | chrome/browser/sync_file_system/local_sync_operation_resolver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/local_sync_operation_resolver.cc
diff --git a/chrome/browser/sync_file_system/local_sync_operation_resolver.cc b/chrome/browser/sync_file_system/local_sync_operation_resolver.cc
index 220ccbfc94b024e86c416d0db40eebb3c4e09e6a..3407d018af7d197311bcdbd05a3f4ca25d23972e 100644
--- a/chrome/browser/sync_file_system/local_sync_operation_resolver.cc
+++ b/chrome/browser/sync_file_system/local_sync_operation_resolver.cc
@@ -11,16 +11,15 @@ namespace sync_file_system {
LocalSyncOperationType LocalSyncOperationResolver::Resolve(
const FileChange& local_file_change,
- bool has_remote_change,
- const FileChange& remote_file_change,
- DriveMetadata* drive_metadata) {
+ const FileChange* remote_file_change,
+ const DriveMetadata* drive_metadata) {
// Invalid combination should never happen.
- if (has_remote_change && remote_file_change.IsTypeUnknown())
+ if (remote_file_change && remote_file_change->IsTypeUnknown())
return LOCAL_SYNC_OPERATION_FAIL;
bool is_conflicting = false;
SyncFileType remote_file_type_in_metadata = SYNC_FILE_TYPE_UNKNOWN;
- if (drive_metadata != NULL) {
+ if (drive_metadata) {
is_conflicting = drive_metadata->conflicted();
if (drive_metadata->type() ==
DriveMetadata_ResourceType_RESOURCE_TYPE_FILE)
@@ -34,17 +33,13 @@ LocalSyncOperationType LocalSyncOperationResolver::Resolve(
switch (local_file_change.file_type()) {
case SYNC_FILE_TYPE_FILE:
return is_conflicting
- ? ResolveForAddOrUpdateFileInConflict(has_remote_change,
- remote_file_change)
- : ResolveForAddOrUpdateFile(has_remote_change,
- remote_file_change,
+ ? ResolveForAddOrUpdateFileInConflict(remote_file_change)
+ : ResolveForAddOrUpdateFile(remote_file_change,
remote_file_type_in_metadata);
case SYNC_FILE_TYPE_DIRECTORY:
return is_conflicting
- ? ResolveForAddDirectoryInConflict(has_remote_change,
- remote_file_change)
- : ResolveForAddDirectory(has_remote_change,
- remote_file_change,
+ ? ResolveForAddDirectoryInConflict()
+ : ResolveForAddDirectory(remote_file_change,
remote_file_type_in_metadata);
case SYNC_FILE_TYPE_UNKNOWN:
NOTREACHED();
@@ -54,17 +49,13 @@ LocalSyncOperationType LocalSyncOperationResolver::Resolve(
switch (local_file_change.file_type()) {
case SYNC_FILE_TYPE_FILE:
return is_conflicting
- ? ResolveForDeleteFileInConflict(has_remote_change,
- remote_file_change)
- : ResolveForDeleteFile(has_remote_change,
- remote_file_change,
+ ? ResolveForDeleteFileInConflict(remote_file_change)
+ : ResolveForDeleteFile(remote_file_change,
remote_file_type_in_metadata);
case SYNC_FILE_TYPE_DIRECTORY:
return is_conflicting
- ? ResolveForDeleteDirectoryInConflict(has_remote_change,
- remote_file_change)
- : ResolveForDeleteDirectory(has_remote_change,
- remote_file_change,
+ ? ResolveForDeleteDirectoryInConflict(remote_file_change)
+ : ResolveForDeleteDirectory(remote_file_change,
remote_file_type_in_metadata);
case SYNC_FILE_TYPE_UNKNOWN:
NOTREACHED();
@@ -76,10 +67,9 @@ LocalSyncOperationType LocalSyncOperationResolver::Resolve(
}
LocalSyncOperationType LocalSyncOperationResolver::ResolveForAddOrUpdateFile(
- bool has_remote_change,
- const FileChange& remote_file_change,
+ const FileChange* remote_file_change,
SyncFileType remote_file_type_in_metadata) {
- if (!has_remote_change) {
+ if (!remote_file_change) {
switch (remote_file_type_in_metadata) {
case SYNC_FILE_TYPE_UNKNOWN:
// Remote file or directory may not exist.
@@ -91,9 +81,9 @@ LocalSyncOperationType LocalSyncOperationResolver::ResolveForAddOrUpdateFile(
}
}
- switch (remote_file_change.change()) {
+ switch (remote_file_change->change()) {
case FileChange::FILE_CHANGE_ADD_OR_UPDATE:
- if (remote_file_change.IsFile())
+ if (remote_file_change->IsFile())
return LOCAL_SYNC_OPERATION_CONFLICT;
return LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE;
case FileChange::FILE_CHANGE_DELETE:
@@ -106,13 +96,12 @@ LocalSyncOperationType LocalSyncOperationResolver::ResolveForAddOrUpdateFile(
LocalSyncOperationType
LocalSyncOperationResolver::ResolveForAddOrUpdateFileInConflict(
- bool has_remote_change,
- const FileChange& remote_file_change) {
- if (!has_remote_change)
+ const FileChange* remote_file_change) {
+ if (!remote_file_change)
return LOCAL_SYNC_OPERATION_CONFLICT;
- switch (remote_file_change.change()) {
+ switch (remote_file_change->change()) {
case FileChange::FILE_CHANGE_ADD_OR_UPDATE:
- if (remote_file_change.IsFile())
+ if (remote_file_change->IsFile())
return LOCAL_SYNC_OPERATION_CONFLICT;
return LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE;
case FileChange::FILE_CHANGE_DELETE:
@@ -123,10 +112,9 @@ LocalSyncOperationResolver::ResolveForAddOrUpdateFileInConflict(
}
LocalSyncOperationType LocalSyncOperationResolver::ResolveForAddDirectory(
- bool has_remote_change,
- const FileChange& remote_file_change,
+ const FileChange* remote_file_change,
SyncFileType remote_file_type_in_metadata) {
- if (!has_remote_change) {
+ if (!remote_file_change) {
switch (remote_file_type_in_metadata) {
case SYNC_FILE_TYPE_UNKNOWN:
// Remote file or directory may not exist.
@@ -138,13 +126,13 @@ LocalSyncOperationType LocalSyncOperationResolver::ResolveForAddDirectory(
}
}
- switch (remote_file_change.change()) {
+ switch (remote_file_change->change()) {
case FileChange::FILE_CHANGE_ADD_OR_UPDATE:
- if (remote_file_change.IsFile())
+ if (remote_file_change->IsFile())
return LOCAL_SYNC_OPERATION_RESOLVE_TO_LOCAL;
return LOCAL_SYNC_OPERATION_NONE;
case FileChange::FILE_CHANGE_DELETE:
- if (remote_file_change.IsFile())
+ if (remote_file_change->IsFile())
return LOCAL_SYNC_OPERATION_ADD_DIRECTORY;
return LOCAL_SYNC_OPERATION_RESOLVE_TO_LOCAL;
}
@@ -154,17 +142,14 @@ LocalSyncOperationType LocalSyncOperationResolver::ResolveForAddDirectory(
}
LocalSyncOperationType
-LocalSyncOperationResolver::ResolveForAddDirectoryInConflict(
- bool has_remote_change,
- const FileChange& remote_file_change) {
+LocalSyncOperationResolver::ResolveForAddDirectoryInConflict() {
return LOCAL_SYNC_OPERATION_RESOLVE_TO_LOCAL;
}
LocalSyncOperationType LocalSyncOperationResolver::ResolveForDeleteFile(
- bool has_remote_change,
- const FileChange& remote_file_change,
+ const FileChange* remote_file_change,
SyncFileType remote_file_type_in_metadata) {
- if (!has_remote_change) {
+ if (!remote_file_change) {
switch (remote_file_type_in_metadata) {
case SYNC_FILE_TYPE_UNKNOWN:
// Remote file or directory may not exist.
@@ -176,7 +161,7 @@ LocalSyncOperationType LocalSyncOperationResolver::ResolveForDeleteFile(
}
}
- switch (remote_file_change.change()) {
+ switch (remote_file_change->change()) {
case FileChange::FILE_CHANGE_ADD_OR_UPDATE:
return LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE;
case FileChange::FILE_CHANGE_DELETE:
@@ -189,11 +174,10 @@ LocalSyncOperationType LocalSyncOperationResolver::ResolveForDeleteFile(
LocalSyncOperationType
LocalSyncOperationResolver::ResolveForDeleteFileInConflict(
- bool has_remote_change,
- const FileChange& remote_file_change) {
- if (!has_remote_change)
+ const FileChange* remote_file_change) {
+ if (!remote_file_change)
return LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE;
- switch (remote_file_change.change()) {
+ switch (remote_file_change->change()) {
case FileChange::FILE_CHANGE_ADD_OR_UPDATE:
return LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE;
case FileChange::FILE_CHANGE_DELETE:
@@ -204,10 +188,9 @@ LocalSyncOperationResolver::ResolveForDeleteFileInConflict(
}
LocalSyncOperationType LocalSyncOperationResolver::ResolveForDeleteDirectory(
- bool has_remote_change,
- const FileChange& remote_file_change,
+ const FileChange* remote_file_change,
SyncFileType remote_file_type_in_metadata) {
- if (!has_remote_change) {
+ if (!remote_file_change) {
switch (remote_file_type_in_metadata) {
case SYNC_FILE_TYPE_UNKNOWN:
// Remote file or dircetory may not exist.
@@ -219,7 +202,7 @@ LocalSyncOperationType LocalSyncOperationResolver::ResolveForDeleteDirectory(
}
}
- switch (remote_file_change.change()) {
+ switch (remote_file_change->change()) {
case FileChange::FILE_CHANGE_ADD_OR_UPDATE:
return LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE;
case FileChange::FILE_CHANGE_DELETE:
@@ -232,11 +215,10 @@ LocalSyncOperationType LocalSyncOperationResolver::ResolveForDeleteDirectory(
LocalSyncOperationType
LocalSyncOperationResolver::ResolveForDeleteDirectoryInConflict(
- bool has_remote_change,
- const FileChange& remote_file_change) {
- if (!has_remote_change)
+ const FileChange* remote_file_change) {
+ if (!remote_file_change)
return LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE;
- switch (remote_file_change.change()) {
+ switch (remote_file_change->change()) {
case FileChange::FILE_CHANGE_ADD_OR_UPDATE:
return LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE;
case FileChange::FILE_CHANGE_DELETE:
« no previous file with comments | « chrome/browser/sync_file_system/local_sync_operation_resolver.h ('k') | chrome/browser/sync_file_system/local_sync_operation_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698