[Sync] //components/sync internal changes [DO NOT SUBMIT]

components/sync/protocol/sync.proto

Index: components/sync/protocol/sync.proto
diff --git a/sync/protocol/sync.proto b/components/sync/protocol/sync.proto
similarity index 97%
copy from sync/protocol/sync.proto
copy to components/sync/protocol/sync.proto
index 64e64089e7bf04fbb3bc1ef2d87f43b408b936f7..f3d2ed3335945ae6633a0b70146c6b66a3a28abb 100644
--- a/sync/protocol/sync.proto
+++ b/components/sync/protocol/sync.proto
@@ -118,7 +118,8 @@ message EntitySpecifics {
   optional AppSettingSpecifics app_setting = 103656;
   optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251;
   optional SyncedNotificationSpecifics synced_notification = 153108;
-  optional SyncedNotificationAppInfoSpecifics synced_notification_app_info = 235816;
+  optional SyncedNotificationAppInfoSpecifics synced_notification_app_info =
+      235816;
   optional DeviceInfoSpecifics device_info = 154522;
   optional ExperimentsSpecifics experiments = 161496;
   optional PriorityPreferenceSpecifics priority_preference = 163425;
@@ -398,15 +399,15 @@ message ClientConfigParams {
   // The set of data types this client has enabled. Note that this does not
   // include proxy types, as they do not have protocol field numbers and are
   // placeholder types that implicitly enable protocol types.
- repeated int32 enabled_type_ids = 1;
+  repeated int32 enabled_type_ids = 1;
 
- // Whether the PROXY_TABS proxy datatype is enabled on this client.
- optional bool tabs_datatype_enabled = 2;
+  // Whether the PROXY_TABS proxy datatype is enabled on this client.
+  optional bool tabs_datatype_enabled = 2;
 
- // Whether the account(s) present in the content area's cookie jar match the
- // chrome account. If multiple accounts are present in the cookie jar, a
- // mismatch implies all of them are different from the chrome account.
- optional bool cookie_jar_mismatch = 3;
+  // Whether the account(s) present in the content area's cookie jar match the
+  // chrome account. If multiple accounts are present in the cookie jar, a
+  // mismatch implies all of them are different from the chrome account.
+  optional bool cookie_jar_mismatch = 3;
 };
 
 message CommitMessage {
@@ -688,11 +689,9 @@ message ClearServerDataResponse {
   // ClientToServerResponse.
 };
 
-message DeprecatedMessage1 {
-};
+message DeprecatedMessage1 {};
 
-message DeprecatedMessage2 {
-};
+message DeprecatedMessage2 {};
 
 // The client must preserve, store, and resend the chip bag with
 // every request.  The server depends on the chip bag in order
@@ -762,7 +761,7 @@ message ClientToServerMessage {
 
   optional DeprecatedMessage1 deprecated_field_9 = 9 [deprecated = true];
 
-  optional string store_birthday = 7; // Opaque store ID; if it changes, duck!
+  optional string store_birthday = 7;  // Opaque store ID; if it changes, duck!
   // The client sets this if it detects a sync issue. The server will tell it
   // if it should perform a refresh.
   optional bool sync_problem_detected = 8 [default = false];
@@ -818,13 +817,13 @@ message GetCrashInfoResponse {
 message CommitResponse {
   enum ResponseType {
     SUCCESS = 1;
-    CONFLICT = 2; // You're out of date; update and check your data
+    CONFLICT = 2;  // You're out of date; update and check your data
     // TODO(ncarter): What's the difference between RETRY and TRANSIENT_ERROR?
-    RETRY = 3; // Someone has a conflicting, non-expired session open
-    INVALID_MESSAGE = 4; // What the client sent was invalid, and trying again
-                         // won't help.
-    OVER_QUOTA = 5; // This operation would put you, or you are, over quota
-    TRANSIENT_ERROR = 6; // Something went wrong; try again in a bit
+    RETRY = 3;            // Someone has a conflicting, non-expired session open
+    INVALID_MESSAGE = 4;  // What the client sent was invalid, and trying again
+                          // won't help.
+    OVER_QUOTA = 5;  // This operation would put you, or you are, over quota
+    TRANSIENT_ERROR = 6;  // Something went wrong; try again in a bit
   }
   repeated group EntryResponse = 1 {
     required ResponseType response_type = 2;
@@ -944,8 +943,8 @@ message GetUpdatesStreamingResponse {
 // The obfuscated id is optional because at least one planned use of the proto
 // (sharing) does not require it.
 message UserIdentification {
-  required string email = 1;  // the user's full primary email address.
-  optional string display_name = 2;  // the user's display name.
+  required string email = 1;          // the user's full primary email address.
+  optional string display_name = 2;   // the user's display name.
   optional string obfuscated_id = 3;  // an obfuscated, opaque user id.
 };
 
@@ -998,9 +997,9 @@ message ClientToServerResponse {
 
   message Error {
     optional SyncEnums.ErrorType error_type = 1 [default = UNKNOWN];
-    optional string error_description       = 2;
-    optional string url                     = 3;
-    optional SyncEnums.Action action        = 4 [default = UNKNOWN_ACTION];
+    optional string error_description = 2;
+    optional string url = 3;
+    optional SyncEnums.Action action = 4 [default = UNKNOWN_ACTION];
 
     // Currently meaningful if |error_type| is throttled or partial_failure.
     // In the throttled case, if this field is absent then the whole client
@@ -1026,8 +1025,7 @@ message EventRequest {
   optional SyncDisabledEvent sync_disabled = 1;
 };
 
-message EventResponse {
-};
+message EventResponse {};
 
 // A message indicating that the sync engine has been disabled on a client.
 message SyncDisabledEvent {