| Index: chrome/browser/sync/test/integration/sync_test.cc
|
| diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
|
| index 415757858c14b4a0e917cd4771a79fb34c9951e4..08e184d759c25ad77f3e26de2d68129128f2ee84 100644
|
| --- a/chrome/browser/sync/test/integration/sync_test.cc
|
| +++ b/chrome/browser/sync/test/integration/sync_test.cc
|
| @@ -626,9 +626,9 @@ namespace {
|
|
|
| sync_pb::ClientToServerResponse::ErrorType
|
| GetClientToServerResponseErrorType(
|
| - browser_sync::SyncProtocolErrorType error) {
|
| + browser_sync::SyncOperationResultType error) {
|
| switch (error) {
|
| - case browser_sync::SYNC_SUCCESS:
|
| + case browser_sync::OPERATION_SUCCESS:
|
| return sync_pb::ClientToServerResponse::SUCCESS;
|
| case browser_sync::NOT_MY_BIRTHDAY:
|
| return sync_pb::ClientToServerResponse::NOT_MY_BIRTHDAY;
|
| @@ -672,7 +672,7 @@ sync_pb::ClientToServerResponse::Error::Action
|
|
|
| } // namespace
|
|
|
| -void SyncTest::TriggerSyncError(const browser_sync::SyncProtocolError& error) {
|
| +void SyncTest::TriggerSyncError(const browser_sync::SyncOperationResult& error) {
|
| ASSERT_TRUE(ServerSupportsErrorTriggering());
|
| std::string path = "chromiumsync/error";
|
| int error_type =
|
|
|