Refresh sync.proto.

BUG=
TEST=

Review URL: http://codereview.chromium.org/3387010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60210 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 25 insertions, 19 deletions

diff --git a/chrome/browser/sync/engine/build_commit_command.cc b/chrome/browser/sync/engine/build_commit_command.cc
index d74cc63..79d4ef7 100644
--- a/chrome/browser/sync/engine/build_commit_command.cc
+++ b/chrome/browser/sync/engine/build_commit_command.cc
@@ -47,7 +47,7 @@ void BuildCommitCommand::AddExtensionsActivityToMessage(
       session->extensions_activity();
   for (ExtensionsActivityMonitor::Records::const_iterator it = records.begin();
        it != records.end(); ++it) {
-    sync_pb::CommitMessage_ChromiumExtensionsActivity* activity_message =
+    sync_pb::ChromiumExtensionsActivity* activity_message =
         message->add_extensions_activity();
     activity_message->set_extension_id(it->second.extension_id);
     activity_message->set_bookmark_writes_since_last_commit(
diff --git a/chrome/browser/sync/protocol/encryption.proto b/chrome/browser/sync/protocol/encryption.proto
index 1a331f4..89aba01 100644
--- a/chrome/browser/sync/protocol/encryption.proto
+++ b/chrome/browser/sync/protocol/encryption.proto
@@ -21,9 +21,10 @@ package sync_pb;
 // change their passphrase (and thus their encryption key) at any time. When
 // that happens, we make a best effort to reencrypt all nodes with the new
 // passphrase, but since we don't have transactions on the server-side, we
-// cannot garantee that every node will be reencrypted. As a workaround, we keep
-// track of all keys, assign each key a name (by using that key to encrypt a
-// well known string) and keep track of which key was used to encrypt each node.
+// cannot guarantee that every node will be reencrypted. As a workaround, we
+// keep track of all keys, assign each key a name (by using that key to encrypt
+// a well known string) and keep track of which key was used to encrypt each
+// node.
 message EncryptedData {
   optional string key_name = 1;
   optional string blob = 2;
diff --git a/chrome/browser/sync/protocol/session_specifics.proto b/chrome/browser/sync/protocol/session_specifics.proto
index e3c7dd5..6fd30a2 100644
--- a/chrome/browser/sync/protocol/session_specifics.proto
+++ b/chrome/browser/sync/protocol/session_specifics.proto
@@ -62,7 +62,7 @@ message TabNavigation {
   // frame.
   optional string state = 5;
   // Types of transitions between pages.
-  enum PageTransition{
+  enum PageTransition {
     LINK = 0;
     TYPED = 1;
     AUTO_BOOKMARK = 2;
diff --git a/chrome/browser/sync/protocol/sync.proto b/chrome/browser/sync/protocol/sync.proto
index 515e08d..3a9fd02 100644
--- a/chrome/browser/sync/protocol/sync.proto
+++ b/chrome/browser/sync/protocol/sync.proto
@@ -232,6 +232,20 @@ message SyncEntity {
   optional string client_defined_unique_tag = 23;
 };
 
+// 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;
+};
+
 message CommitMessage {
   repeated SyncEntity entries = 1;
 
@@ -239,20 +253,6 @@ message CommitMessage {
   // 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;
 };
 
@@ -293,6 +293,11 @@ message GetUpdatesMessage {
   // requested_types may contain multiple EntitySpecifics extensions -- in this
   // event, the server will return items of all the indicated types.
   optional EntitySpecifics requested_types = 4;
+
+  // Client-requested limit on the maximum number of updates to return at once.
+  // The server may opt to return fewer updates than this amount, but it should
+  // not return more.
+  optional int32 batch_size = 5;
 };
 
 message AuthenticateMessage {