Revert (4 of 4) 30153 - Introduce browser_sync::ExtensionsActivityMonitor to ...

chrome/browser/sync/protocol/sync.proto

 // Copyright (c) 2009 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.
 //
 // Sync protocol for communication between sync client and server.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
@@ skipping 154 matching lines @@
   // Present only in GetUpdatesResponse.
   optional string originator_client_item_id = 20;
 };
 
 message CommitMessage {
   repeated SyncEntity entries = 1;
 
   // A GUID that identifies the committing sync client.  This value will be
   // returned as originator_cache_guid for any new items.
   optional string cache_guid = 2;
-
-  // This message contains diagnostic information used to correlate
-  // commit-related traffic with extensions-related mutations to the
-  // data models in chromium.  It plays no functional role in
-  // processing this CommitMessage.
-  message ChromiumExtensionsActivity {
-    // The human-readable ID identifying the extension responsible
-    // for the traffic reported in this ChromiumExtensionsActivity.
-    optional string extension_id = 1;
-    
-    // How many times the extension successfully invoked a write
-    // operation through the bookmarks API since the last CommitMessage.
-    optional uint32 bookmark_writes_since_last_commit = 2;
-  }
-
-  repeated ChromiumExtensionsActivity extensions_activity = 3;
 };
 
 message GetUpdatesCallerInfo {
   enum GET_UPDATES_SOURCE {
     UNKNOWN = 0;  // The source was not set by the caller.
     FIRST_UPDATE = 1;  // First update from an instance of Chrome.
     LOCAL = 2;  // The source of the update was a local change.
     NOTIFICATION = 3;  // The source of the update was a p2p notification.
     PERIODIC = 4;  // The source of the update was periodic polling.
     SYNC_CYCLE_CONTINUATION = 5;  // The source of the update was a
@@ skipping 11 matching lines @@
   // Indicates the reason for the GetUpdatesMessage.
   optional GetUpdatesCallerInfo caller_info = 2;
 };
 
 message AuthenticateMessage {
   required string auth_token = 1;
 };
 
 message ClientToServerMessage {
   required string share = 1;
-  optional int32 protocol_version = 2 [default = 22];
+  optional int32 protocol_version = 2 [default = 21];
   enum CONTENTS {
     COMMIT = 1;
     GET_UPDATES = 2;
     AUTHENTICATE = 3;
   }
 
   required CONTENTS message_contents = 3;
   optional CommitMessage commit = 4;
   optional GetUpdatesMessage get_updates = 5;
   optional AuthenticateMessage authenticate = 6;
@@ skipping 19 matching lines @@
     required RESPONSE_TYPE response_type = 2;
 
     // Sync servers may also return a new ID for an existing item, indicating
     // a new entry's been created to hold the data the client's sending up.
     optional string id_string = 3;
 
     // should be filled if our parent was assigned a new ID.
     optional string parent_id_string = 4;
 
     // This value is the same as the position_in_parent value returned within
-    // the SyncEntity message in GetUpdatesResponse.
+    // the SyncEntity message in GetUpdatesResponse.  It is returned if the
+    // item was assigned a new position.
     optional int64 position_in_parent = 5;
 
     // The item's current version.
     optional int64 version = 6;
 
     // Allows the server to move-aside an entry as it's being committed.
     // This name is the same as the name field returned within the SyncEntity
     // message in GetUpdatesResponse.
     optional string name = 7;
 
@@ skipping 76 matching lines @@
   // Opaque store ID; if it changes, the contents of the client's cache
   // is meaningless to this server.  This happens most typically when
   // you switch from one storage backend instance (say, a test instance)
   // to another (say, the official instance).
   optional string store_birthday = 6;
 
   optional ClientCommand client_command = 7;
   optional ProfilingData profiling_data = 8;
 };