Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 7 insertions, 0 deletions

diff --git a/chrome/browser/sync/engine/syncer_proto_util.cc b/chrome/browser/sync/engine/syncer_proto_util.cc
index ffc00d8..2603b0a 100644
--- a/chrome/browser/sync/engine/syncer_proto_util.cc
+++ b/chrome/browser/sync/engine/syncer_proto_util.cc
@@ -195,6 +195,10 @@ bool SyncerProtoUtil::PostClientToServerMessage(
   }
 
   switch (response->error_code()) {
+    case ClientToServerResponse::UNKNOWN:
+      LOG(WARNING) << "Sync protocol out-of-date. The server is using a more "
+                   << "recent version.";
+      return false;
     case ClientToServerResponse::SUCCESS:
       LogResponseProfilingData(*response);
       return true;
@@ -203,11 +207,14 @@ bool SyncerProtoUtil::PostClientToServerMessage(
       session->delegate()->OnSilencedUntil(base::TimeTicks::Now() +
           base::TimeDelta::FromSeconds(kSyncDelayAfterThrottled));
       return false;
+    case ClientToServerResponse::TRANSIENT_ERROR:
+      return false;
     case ClientToServerResponse::USER_NOT_ACTIVATED:
     case ClientToServerResponse::AUTH_INVALID:
     case ClientToServerResponse::ACCESS_DENIED:
       // WARNING: PostAndProcessHeaders contains a hack for this case.
       LOG(WARNING) << "SyncerProtoUtil: Authentication expired.";
+      // TODO(sync): Was this meant to be a fall-through?
     default:
       NOTREACHED();
       return false;