Merge pull request #49 from brave/update_C85

Update protobuf files to Chromium 85.0.4183.83

README.md

@@ -2,7 +2,7 @@
 
 A sync server implemented in go to communicate with Brave sync clients using
 [components/sync/protocol/sync.proto](https://cs.chromium.org/chromium/src/components/sync/protocol/sync.proto).
-Current Chromium version for sync protocol buffer files used in this repo is Chromium 83.0.4103.61.
+Current Chromium version for sync protocol buffer files used in this repo is Chromium 85.0.4183.83.
 
 This server supports endpoints as bellow.
 - The `POST /v2/command/` endpoint handles Commit and GetUpdates requests from sync clients and return corresponding responses both in protobuf format. Detailed of requests and their corresponding responses are defined in `schema/protobuf/sync_pb/sync.proto`. Sync clients are responsible for generating valid access tokens and present them to the server in the Authorization header of requests.

datastore/sync_entity.go

@@ -32,7 +32,6 @@ type SyncEntity struct {
 	ClientID               string
 	ID                     string
 	ParentID               *string `dynamodbav:",omitempty"`
-	OldParentID            *string `dynamodbav:",omitempty"`
 	Version                *int64
 	Mtime                  *int64
 	Ctime                  *int64
@@ -281,9 +280,6 @@ func (dynamo *Dynamo) UpdateSyncEntity(entity *SyncEntity) (bool, bool, error) {
 	if entity.ParentID != nil {
 		update = update.Set(expression.Name("ParentID"), expression.Value(entity.ParentID))
 	}
-	if entity.OldParentID != nil {
-		update = update.Set(expression.Name("OldParentID"), expression.Value(entity.OldParentID))
-	}
 	if entity.Name != nil {
 		update = update.Set(expression.Name("Name"), expression.Value(entity.Name))
 	}
@@ -570,7 +566,6 @@ func CreateDBSyncEntity(entity *sync_pb.SyncEntity, cacheGUID *string, clientID
 		ClientID:               clientID,
 		ID:                     id,
 		ParentID:               entity.ParentIdString,
-		OldParentID:            entity.OldParentId,
 		Version:                entity.Version,
 		Ctime:                  cTime,
 		Mtime:                  now,
@@ -594,7 +589,6 @@ func CreatePBSyncEntity(entity *SyncEntity) (*sync_pb.SyncEntity, error) {
 	pbEntity := &sync_pb.SyncEntity{
 		IdString:               &entity.ID,
 		ParentIdString:         entity.ParentID,
-		OldParentId:            entity.OldParentID,
 		Version:                entity.Version,
 		Mtime:                  entity.Mtime,
 		Ctime:                  entity.Ctime,

datastore/sync_entity_test.go

@@ -277,7 +277,6 @@ func (suite *SyncEntityTestSuite) TestUpdateSyncEntity_Basic() {
 	updateEntity2.Folder = aws.Bool(false)
 	updateEntity2.UniquePosition = []byte{5, 6}
 	updateEntity2.ParentID = aws.String("parentID")
-	updateEntity2.OldParentID = aws.String("oldParentID")
 	updateEntity2.Name = aws.String("name")
 	updateEntity2.NonUniqueName = aws.String("non_unique_name")
 	conflict, delete, err = suite.dynamo.UpdateSyncEntity(&updateEntity2)
@@ -525,7 +524,6 @@ func (suite *SyncEntityTestSuite) TestCreateDBSyncEntity() {
 	pbEntity := sync_pb.SyncEntity{
 		IdString:               aws.String("client_item_id"),
 		ParentIdString:         aws.String("parent_id"),
-		OldParentId:            aws.String("old_parent_id"),
 		Version:                aws.Int64(0),
 		Name:                   aws.String("name"),
 		NonUniqueName:          aws.String("non_unique_name"),
@@ -539,7 +537,6 @@ func (suite *SyncEntityTestSuite) TestCreateDBSyncEntity() {
 	expectedDBEntity := datastore.SyncEntity{
 		ClientID:               "client1",
 		ParentID:               pbEntity.ParentIdString,
-		OldParentID:            pbEntity.OldParentId,
 		Version:                pbEntity.Version,
 		Name:                   pbEntity.Name,
 		NonUniqueName:          pbEntity.NonUniqueName,
@@ -637,7 +634,6 @@ func (suite *SyncEntityTestSuite) TestCreatePBSyncEntity() {
 		ClientID:               "client1",
 		ID:                     "id1",
 		ParentID:               aws.String("parent_id"),
-		OldParentID:            aws.String("old_parent_id"),
 		Version:                aws.Int64(10),
 		Mtime:                  aws.Int64(12345678),
 		Ctime:                  aws.Int64(12345678),
@@ -657,7 +653,6 @@ func (suite *SyncEntityTestSuite) TestCreatePBSyncEntity() {
 	expectedPBEntity := sync_pb.SyncEntity{
 		IdString:               &dbEntity.ID,
 		ParentIdString:         dbEntity.ParentID,
-		OldParentId:            dbEntity.OldParentID,
 		Version:                dbEntity.Version,
 		Mtime:                  dbEntity.Mtime,
 		Ctime:                  dbEntity.Ctime,

schema/protobuf/sync_pb/device_info_specifics.proto

@@ -71,6 +71,9 @@ message DeviceInfoSpecifics {
   // excludes backgrounded apps on Android). Introduced in M81. The legacy
   // default was 1 day.
   optional int32 pulse_interval_in_minutes = 13;
+
+  // Device specific information for Sync invalidations.
+  optional InvalidationSpecificFields invalidation_fields = 14;
 }
 
 // Feature specific information about the device that is running a sync-enabled
@@ -137,3 +140,11 @@ message SharingSpecificFields {
   // Auth secret for message encryption [RFC8291] using Sharing sender ID.
   optional bytes sender_id_auth_secret_v2 = 10;
 }
+
+// Device specific information telling how to send invalidations to this device.
+message InvalidationSpecificFields {
+  // FCM registration token of device (using Sync sender ID).
+  optional string instance_id_token = 1;
+
+  // TODO(crbug.com/1082117): add data types list.
+}

schema/protobuf/sync_pb/entity_metadata.proto

@@ -71,4 +71,9 @@ message EntityMetadata {
   // unique_position.proto for more information about its internal
   // representation.
   optional UniquePosition unique_position = 11;
+
+  // Used only for bookmarks. It's analogous to |specifics_hash| but it
+  // exclusively hashes the content of the favicon image, as represented in
+  // proto field BookmarkSpecifics.favicon, using base::PersistentHash().
+  optional fixed32 bookmark_favicon_hash = 12;
 }

schema/protobuf/sync_pb/sharing_message_specifics.proto

@@ -70,10 +70,15 @@ message SharingMessageCommitError {
     // Client-specific error codes.
     SYNC_TURNED_OFF = 8;
     SYNC_NETWORK_ERROR = 9;
-    // Error code for server error or unparsable server response.
-    SYNC_SERVER_ERROR = 10;
+    // Deprecated UMA bucket, prior to splitting between SYNC_SERVER_ERROR and
+    // SYNC_AUTH_ERROR.
+    DEPRECATED_SYNC_SERVER_OR_AUTH_ERROR = 10;
     // Message wasn't committed before timeout.
     SYNC_TIMEOUT = 11;
+    // Error code for server error or unparsable server response.
+    SYNC_SERVER_ERROR = 12;
+    // Auth error when communicating with the server.
+    SYNC_AUTH_ERROR = 13;
   }
 
   optional ErrorCode error_code = 1;