| Index: chrome/browser/sync/engine/syncer_proto_util.cc
|
| ===================================================================
|
| --- chrome/browser/sync/engine/syncer_proto_util.cc (revision 52107)
|
| +++ chrome/browser/sync/engine/syncer_proto_util.cc (working copy)
|
| @@ -83,6 +83,9 @@
|
|
|
| std::string local_birthday = dir->store_birthday();
|
|
|
| + // TODO(tim): Bug 46807. Check for new response code denoting a clear store
|
| + // operation is in progress.
|
| +
|
| if (local_birthday.empty()) {
|
| if (!response->has_store_birthday()) {
|
| LOG(WARNING) << "Expected a birthday on first sync.";
|
| @@ -189,6 +192,7 @@
|
| // TODO(ncarter): Add a unit test for the case where the syncer becomes
|
| // stuck due to a bad birthday.
|
| session->status_controller()->set_syncer_stuck(true);
|
| + session->delegate()->OnShouldStopSyncingPermanently();
|
| return false;
|
| }
|
|
|
| @@ -196,9 +200,6 @@
|
| case ClientToServerResponse::SUCCESS:
|
| LogResponseProfilingData(*response);
|
| return true;
|
| - case ClientToServerResponse::NOT_MY_BIRTHDAY:
|
| - LOG(WARNING) << "Server thought we had wrong birthday.";
|
| - return false;
|
| case ClientToServerResponse::THROTTLED:
|
| LOG(WARNING) << "Client silenced by server.";
|
| session->delegate()->OnSilencedUntil(base::TimeTicks::Now() +
|
|
|