| Index: components/sync/protocol/nigori_specifics.proto
|
| diff --git a/sync/protocol/nigori_specifics.proto b/components/sync/protocol/nigori_specifics.proto
|
| similarity index 97%
|
| rename from sync/protocol/nigori_specifics.proto
|
| rename to components/sync/protocol/nigori_specifics.proto
|
| index 773c7ee1b34501698f92e9ed47cf92519c60274e..6c53460af6233a051c1097c0996406035cec0fe5 100644
|
| --- a/sync/protocol/nigori_specifics.proto
|
| +++ b/components/sync/protocol/nigori_specifics.proto
|
| @@ -94,12 +94,11 @@ message NigoriSpecifics {
|
| // decrypt |encryption_keybag|.
|
| KEYSTORE_PASSPHRASE = 2;
|
| // Previous Gaia-based passphrase frozen and treated as a custom passphrase.
|
| - FROZEN_IMPLICIT_PASSPHRASE = 3;
|
| + FROZEN_IMPLICIT_PASSPHRASE = 3;
|
| // User provided custom passphrase.
|
| CUSTOM_PASSPHRASE = 4;
|
| }
|
| - optional PassphraseType passphrase_type = 30
|
| - [default = IMPLICIT_PASSPHRASE];
|
| + optional PassphraseType passphrase_type = 30 [default = IMPLICIT_PASSPHRASE];
|
|
|
| // The keystore decryptor token blob. Encrypted with the keystore key, and
|
| // contains the encryption key used to decrypt |encryption_keybag|.
|
| @@ -142,4 +141,3 @@ message NigoriSpecifics {
|
| // Boolean corresponding to whether arc pakcage items should be encrypted.
|
| optional bool encrypt_arc_package = 41;
|
| }
|
| -
|
|
|