Take 2: sync changes to support encryption

chrome/browser/sync/protocol/password_specifics.proto

Index: chrome/browser/sync/protocol/password_specifics.proto
diff --git a/chrome/browser/sync/protocol/password_specifics.proto b/chrome/browser/sync/protocol/password_specifics.proto
index 4d1bc17ef8e1368b3b4516feb6ad6e1e2a6af6f0..efd3400b181a6c03e1ed4df38292496c1402e57f 100644
--- a/chrome/browser/sync/protocol/password_specifics.proto
+++ b/chrome/browser/sync/protocol/password_specifics.proto
@@ -10,10 +10,11 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
+import "encryption.proto";
 import "sync.proto";
 
-// These are the properties that get serialized into the |blob| field of
-// |PasswordSpecifics|.
+// These are the properties that get serialized into the |encrypted| field of
+// PasswordSpecifics.
 message PasswordSpecificsData {
   optional int32 scheme = 1;
   optional string signon_realm = 2;
@@ -29,10 +30,10 @@ message PasswordSpecificsData {
   optional bool blacklisted = 12;
 }
 
-// Properties of password sync objects.
+// Properties of password sync objects. The actual password data is held in a
+// PasswordSpecificsData that is encrypted into |encrypted|.
 message PasswordSpecifics {
-  optional string key = 1;
-  optional string blob = 2;
+  optional EncryptedData encrypted = 1;
 }
 
 extend EntitySpecifics {