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

Unified Diff: sync/engine/syncer_proto_util.h

Issue 11485019: [Sync] Add tests for invalid specifics field number handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years 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.h
diff --git a/sync/engine/syncer_proto_util.h b/sync/engine/syncer_proto_util.h
index b78a3507c65161a8135be5bfa9b31d6346b41cf6..5b8832abf59d11379e2cbf3d0c6544759526efd6 100644
--- a/sync/engine/syncer_proto_util.h
+++ b/sync/engine/syncer_proto_util.h
@@ -9,6 +9,7 @@
#include "base/gtest_prod_util.h"
#include "base/time.h"
+#include "sync/base/sync_export.h"
#include "sync/internal_api/public/base/model_type.h"
#include "sync/internal_api/public/util/syncer_error.h"
#include "sync/sessions/sync_session.h"
@@ -17,6 +18,7 @@
namespace sync_pb {
class ClientToServerMessage;
class ClientToServerResponse;
+class ClientToServerResponse_Error;
class CommitResponse_EntryResponse;
class EntitySpecifics;
class SyncEntity;
@@ -37,6 +39,14 @@ class Directory;
class Entry;
}
+// Returns the types to migrate from the data in |response|.
+SYNC_EXPORT_PRIVATE ModelTypeSet GetTypesToMigrate(
+ const sync_pb::ClientToServerResponse& response);
+
+// Builds a SyncProtocolError from the data in |error|.
+SYNC_EXPORT_PRIVATE SyncProtocolError ConvertErrorPBToLocalType(
+ const sync_pb::ClientToServerResponse_Error& error);
+
class SyncerProtoUtil {
public:
// Posts the given message and fills the buffer with the returned value.
@@ -114,14 +124,9 @@ class SyncerProtoUtil {
// Verifies the store birthday, alerting/resetting as appropriate if there's a
// mismatch. Return false if the syncer should be stuck.
- static bool VerifyResponseBirthday(syncable::Directory* dir,
- const sync_pb::ClientToServerResponse* response);
-
- // Builds and sends a SyncEngineEvent to begin migration for types (specified
- // in notification).
- static void HandleMigrationDoneResponse(
- const sync_pb::ClientToServerResponse* response,
- sessions::SyncSession* session);
+ static bool VerifyResponseBirthday(
+ const sync_pb::ClientToServerResponse& response,
+ syncable::Directory* dir);
// Post the message using the scm, and do some processing on the returned
// headers. Decode the server response.

Powered by Google App Engine
This is Rietveld 408576698