Add support to GCMKeyStore for multiple keys per app_id

components/gcm_driver/crypto/proto/gcm_encryption_data.proto

Index: components/gcm_driver/crypto/proto/gcm_encryption_data.proto
diff --git a/components/gcm_driver/crypto/proto/gcm_encryption_data.proto b/components/gcm_driver/crypto/proto/gcm_encryption_data.proto
index a435c4a69b536188a61f2183229ca61c17931e21..e19fe125fe7d9f6b1b28e6a33cf1467beb1113dd 100644
--- a/components/gcm_driver/crypto/proto/gcm_encryption_data.proto
+++ b/components/gcm_driver/crypto/proto/gcm_encryption_data.proto
@@ -29,18 +29,24 @@ message KeyPair {
   optional bytes public_key = 4;
 }
 
-// Stores a vector of public/private key-pairs associated with an app id.
+// Stores a vector of public/private key-pairs associated with an app id and
+// optionally the authorized entity of an instance id token.
 //
-// In the current implementation, each app id will have a single encryption key-
-// pair associated with it at most. The message allows for multiple key pairs
-// in case we need to force-cycle all keys, allowing the old keys to remain
-// valid for a period of time enabling the web app to update.
+// In the current implementation, each (app_id, instance_id_authorized_entity)
+// pair will have a single encryption key-pair associated with it at most. The
+// message allows for multiple key pairs in case we need to force-cycle all
+// keys, allowing the old keys to remain valid for a period of time enabling the
+// web app to update.
 //
 // Next tag: 4

[Peter Beverloo, 2016/05/09 14:10:10]

5

[johnme, 2016/05/09 18:15:55]

Done.

 message EncryptionData {
   // The app id to whom this encryption data belongs.
   required string app_id = 1;
 
+  // The sender id of the instance id token to whom this encryption data
+  // belongs. Must not be empty. Must be omitted for legacy GCM registrations.
+  optional string instance_id_authorized_entity = 4;
+
   // The actual public/private key-pairs.
   repeated KeyPair keys = 2;