Commit 4bf1d748 authored by ckehoe@chromium.org's avatar ckehoe@chromium.org

We have recently removed usage of these deprecated fields from the code. This...

We have recently removed usage of these deprecated fields from the code. This CL removes them from the protos too.

Review URL: https://codereview.chromium.org/467753002

Cr-Commit-Position: refs/heads/master@{#289130}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289130 0039d316-1c4b-4281-b951-d872f2087c98
parent 4c0be61f
...@@ -13,16 +13,6 @@ message Status { ...@@ -13,16 +13,6 @@ message Status {
optional StatusCode code = 1; optional StatusCode code = 1;
optional string message = 2; optional string message = 2;
} }
message DeviceRegistration {
optional PushService service = 1 [deprecated = true];
optional string device_token = 2 [deprecated = true];
optional DeviceIdentity device_identity = 3 [deprecated = true];
optional string app_name = 4 [deprecated = true];
optional bytes device_token_binary = 5 [deprecated = true];
optional string registered_device_id = 6 [deprecated = true];
optional int32 ulr_device_id = 7 [deprecated = true];
optional Identity registrant = 8 [deprecated = true];
}
message PushServiceRegistration { message PushServiceRegistration {
optional PushService service = 1; optional PushService service = 1;
} }
...@@ -34,10 +24,8 @@ message DeviceIdentifiers { ...@@ -34,10 +24,8 @@ message DeviceIdentifiers {
message Token { message Token {
message Debug { message Debug {
repeated string email = 2; repeated string email = 2;
extensions 1 to 1;
} }
optional string id = 1; optional string id = 1;
optional uint32 ttl_millis_deprecated = 2 [deprecated = true];
optional TokenStatus status = 3; optional TokenStatus status = 3;
optional Debug debug = 4; optional Debug debug = 4;
} }
...@@ -67,7 +55,6 @@ message DeviceState { ...@@ -67,7 +55,6 @@ message DeviceState {
} }
message DebugInfo { message DebugInfo {
optional string served_by_task = 1; optional string served_by_task = 1;
optional bool listen_initiated_by_location_deprecated = 2 [deprecated = true];
repeated string token_id = 3; repeated string token_id = 3;
optional int64 request_time_millis = 4; optional int64 request_time_millis = 4;
} }
...@@ -83,7 +70,6 @@ message TokenSignals { ...@@ -83,7 +70,6 @@ message TokenSignals {
message AccessPolicy { message AccessPolicy {
optional int64 ttl_millis = 1; optional int64 ttl_millis = 1;
optional Acl acl = 2; optional Acl acl = 2;
extensions 4 to 4;
} }
message Acl { message Acl {
optional AclType acl_type = 1; optional AclType acl_type = 1;
...@@ -136,10 +122,6 @@ message Subscription { ...@@ -136,10 +122,6 @@ message Subscription {
optional TokenExchangeStrategy token_exchange_strategy = 7; optional TokenExchangeStrategy token_exchange_strategy = 7;
optional OptInStateFilter opt_in_state_filter = 8; optional OptInStateFilter opt_in_state_filter = 8;
} }
message DeleteAll {
optional DeleteAllType type = 1;
repeated string namespace = 2;
}
message MessageResult { message MessageResult {
optional string published_message_id = 1; optional string published_message_id = 1;
} }
......
...@@ -64,13 +64,6 @@ enum TransmissionStrategy { ...@@ -64,13 +64,6 @@ enum TransmissionStrategy {
OPPORTUNISTIC = 2; OPPORTUNISTIC = 2;
PASSIVE = 3; PASSIVE = 3;
} }
enum DeleteAllType {
UNKNOWN_DELETE_ALL_TYPE = 0;
DELETE_NONE = 1;
DELETE_ALL_FOR_IDENTITY_DEVICE = 2;
DELETE_ALL_FOR_IDENTITY = 3;
DELETE_ALL_FOR_DEVICE_APP = 4;
}
enum StatusCode { enum StatusCode {
STATUS_CODE_UNKNOWN = -1; STATUS_CODE_UNKNOWN = -1;
OK = 0; OK = 0;
......
...@@ -4,7 +4,6 @@ option optimize_for = LITE_RUNTIME; ...@@ -4,7 +4,6 @@ option optimize_for = LITE_RUNTIME;
import "enums.proto"; import "enums.proto";
message Identity { message Identity {
optional IdentityType type = 1; optional IdentityType type = 1;
optional string obfuscated_gaia_id = 2 [deprecated = true];
optional string chromecast_id = 3; optional string chromecast_id = 3;
optional string android_id = 4; optional string android_id = 4;
optional string chrome_id = 5; optional string chrome_id = 5;
......
...@@ -5,24 +5,19 @@ import "codes.proto"; ...@@ -5,24 +5,19 @@ import "codes.proto";
import "enums.proto"; import "enums.proto";
import "data.proto"; import "data.proto";
message RequestHeader { message RequestHeader {
optional DeviceRegistration device_id = 3 [deprecated = true];
optional ClientVersion client_version = 4; optional ClientVersion client_version = 4;
optional ClientVersion framework_version = 5; optional ClientVersion framework_version = 5;
optional int64 current_time_millis = 6; optional int64 current_time_millis = 6;
optional string registered_device_id = 7; optional string registered_device_id = 7;
repeated string experiment_override = 8; repeated string experiment_override = 8;
optional string configuration_etag = 11; optional string configuration_etag = 11;
extensions 9 to 9;
} }
message ResponseHeader { message ResponseHeader {
optional ErrorType error_type = 1 [deprecated = true];
optional DebugInfo debug_info = 2; optional DebugInfo debug_info = 2;
optional Status status = 3; optional Status status = 3;
} }
message RegisterDeviceRequest { message RegisterDeviceRequest {
optional RequestHeader header = 1; optional RequestHeader header = 1;
optional DeviceRegistration old_registration = 2 [deprecated = true];
optional DeviceRegistration new_registration = 3 [deprecated = true];
optional PushServiceRegistration push_service = 5; optional PushServiceRegistration push_service = 5;
optional DeviceIdentifiers device_identifiers = 6; optional DeviceIdentifiers device_identifiers = 6;
} }
...@@ -43,12 +38,10 @@ message UpdateSignalsRequest { ...@@ -43,12 +38,10 @@ message UpdateSignalsRequest {
message ManageMessagesRequest { message ManageMessagesRequest {
repeated PublishedMessage message_to_publish = 1; repeated PublishedMessage message_to_publish = 1;
repeated string id_to_unpublish = 2; repeated string id_to_unpublish = 2;
optional DeleteAll delete_all = 3;
} }
message ManageSubscriptionsRequest { message ManageSubscriptionsRequest {
repeated Subscription subscription = 1; repeated Subscription subscription = 1;
repeated string id_to_unsubscribe = 2; repeated string id_to_unsubscribe = 2;
optional DeleteAll delete_all = 3;
} }
message ReportResponse { message ReportResponse {
optional ResponseHeader header = 1; optional ResponseHeader header = 1;
...@@ -65,10 +58,8 @@ message UpdateSignalsResponse { ...@@ -65,10 +58,8 @@ message UpdateSignalsResponse {
message ManageMessagesResponse { message ManageMessagesResponse {
optional util.error.Code status = 1; optional util.error.Code status = 1;
repeated MessageResult published_message_result = 3; repeated MessageResult published_message_result = 3;
extensions 2 to 2;
} }
message ManageSubscriptionsResponse { message ManageSubscriptionsResponse {
optional util.error.Code status = 1; optional util.error.Code status = 1;
repeated SubscriptionResult subscription_result = 3; repeated SubscriptionResult subscription_result = 3;
extensions 2 to 2;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment