[Sync] Add tests for invalid specifics field number handling

sync/engine/syncer_proto_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SYNC_ENGINE_SYNCER_PROTO_UTIL_H_
 #define SYNC_ENGINE_SYNCER_PROTO_UTIL_H_
 
 #include <string>
 
 #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"
 #include "sync/syncable/blob.h"
 
 namespace sync_pb {
 class ClientToServerMessage;
 class ClientToServerResponse;
+class ClientToServerResponse_Error;
 class CommitResponse_EntryResponse;
 class EntitySpecifics;
 class SyncEntity;
 }
 
 namespace syncer {
 
 class ThrottledDataTypeTracker;
 class ServerConnectionManager;
 
 namespace sessions {
 class SyncProtocolError;
 class SyncSessionContext;
 }
 
 namespace syncable {
 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.
   // Returns true on success.  Also handles store birthday verification: will
   // produce a SyncError if the birthday is incorrect.
   // NOTE: This will add all fields that must be sent on every request, which
   // includes store birthday, protocol version, client chips, api keys, etc.
   static SyncerError PostClientToServerMessage(
       sync_pb::ClientToServerMessage* msg,
       sync_pb::ClientToServerResponse* response,
@@ skipping 57 matching lines @@
   // Set the protocol version field in the outgoing message.
   static void SetProtocolVersion(sync_pb::ClientToServerMessage* msg);
 
  private:
   SyncerProtoUtil() {}
 
   // Helper functions for PostClientToServerMessage.
 
   // 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.
   static bool PostAndProcessHeaders(ServerConnectionManager* scm,
                                     sessions::SyncSession* session,
                                     const sync_pb::ClientToServerMessage& msg,
                                     sync_pb::ClientToServerResponse* response);
 
   static base::TimeDelta GetThrottleDelay(
       const sync_pb::ClientToServerResponse& response);
@@ skipping 10 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(SyncerProtoUtilTest, VerifyResponseBirthday);
   FRIEND_TEST_ALL_PREFIXES(SyncerProtoUtilTest, HandleThrottlingNoDatatypes);
   FRIEND_TEST_ALL_PREFIXES(SyncerProtoUtilTest, HandleThrottlingWithDatatypes);
 
   DISALLOW_COPY_AND_ASSIGN(SyncerProtoUtil);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_SYNCER_PROTO_UTIL_H_