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

Unified Diff: sync/engine/syncer_proto_util.cc

Issue 10455012: [Sync] Add support for performing a GetKey on startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 5 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
Index: sync/engine/syncer_proto_util.cc
diff --git a/sync/engine/syncer_proto_util.cc b/sync/engine/syncer_proto_util.cc
index c88b7c3a2cd32371f32fc6bf8c6cedb075d2e22b..dc222878c9dbce90a144baffc849a1320c8fce27 100644
--- a/sync/engine/syncer_proto_util.cc
+++ b/sync/engine/syncer_proto_util.cc
@@ -347,7 +347,9 @@ SyncerError SyncerProtoUtil::PostClientToServerMessage(
CHECK(response);
DCHECK(!msg.get_updates().has_from_timestamp()); // Deprecated.
DCHECK(!msg.get_updates().has_requested_types()); // Deprecated.
- DCHECK(msg.has_store_birthday() || IsVeryFirstGetUpdates(msg))
+ DCHECK(msg.has_store_birthday() ||
+ IsVeryFirstGetUpdates(msg) ||
+ msg.has_get_encryption_key())
<< "Must call AddRequestBirthday to set birthday.";
syncable::Directory* dir = session->context()->directory();

Powered by Google App Engine
This is Rietveld 408576698