[Sync] Fix sync proto files to better match server versions

BUG=
TEST=


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

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

chrome/browser/sync/protocol/autofill_specifics.proto

@@ -22,7 +22,7 @@ import "sync.proto";
 message AutofillProfileSpecifics {
   // User-defined label.
   optional string label = 1;
-  
+
   optional string guid = 15;
 
   // Contact info.
@@ -46,7 +46,7 @@ message AutofillProfileSpecifics {
 }
 
 message AutofillCreditCardSpecifics {
-  // User-defined label (e.g. Amazon Visa). 
+  // User-defined label (e.g. Amazon Visa).
   optional string label = 1;
 
   // The cardholder's name.

chrome/browser/sync/protocol/nigori_specifics.proto

@@ -37,16 +37,16 @@ message NigoriSpecifics {
   
   // Obsolete encryption fields. These were deprecated due to legacy versions
   // that understand their usage but did not perform encryption properly.
-  // optional bool encrypt_bookmarks = 3;
-  // optional bool encrypt_preferences = 4;
-  // optional bool encrypt_autofill_profile = 5;
-  // optional bool encrypt_autofill = 6;
-  // optional bool encrypt_themes = 7;
-  // optional bool encrypt_typed_urls = 8;
-  // optional bool encrypt_extensions = 9;
-  // optional bool encrypt_sessions = 10;
-  // optional bool encrypt_apps = 11;
-  // optional bool encrypt_search_engines = 12;
+  // optional bool deprecated_encrypt_bookmarks = 3;
+  // optional bool deprecated_encrypt_preferences = 4;
+  // optional bool deprecated_encrypt_autofill_profile = 5;
+  // optional bool deprecated_encrypt_autofill = 6;
+  // optional bool deprecated_encrypt_themes = 7;
+  // optional bool deprecated_encrypt_typed_urls = 8;
+  // optional bool deprecated_encrypt_extensions = 9;
+  // optional bool deprecated_encrypt_sessions = 10;
+  // optional bool deprecated_encrypt_apps = 11;
+  // optional bool deprecated_encrypt_search_engines = 12;
   
   // Booleans corresponding to whether a datatype should be encrypted.
   // Passwords are always encrypted, so we don't need a field here.