sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference

sync/internal_api/sync_encryption_handler_impl_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/internal_api/sync_encryption_handler_impl.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 405 matching lines @@
   sync_pb::NigoriSpecifics nigori;
   nigori.set_encrypt_everything(true);
 
   EXPECT_CALL(*observer(),
               OnEncryptedTypesChanged(
                   HasModelTypes(EncryptableUserTypes()), true));
 
   EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());
   ModelTypeSet encrypted_types =
       encryption_handler()->GetEncryptedTypesUnsafe();
-  EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(PASSWORDS)));
+  EXPECT_TRUE(encrypted_types.Equals(
+      ModelTypeSet(PASSWORDS, WIFI_CREDENTIALS)));
 
   {
     WriteTransaction trans(FROM_HERE, user_share());
     encryption_handler()->UpdateEncryptedTypesFromNigori(
         nigori,
         trans.GetWrappedTrans());
   }
 
   EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled());
   encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe();
@@ skipping 15 matching lines @@
   sync_pb::NigoriSpecifics nigori;
   nigori.set_encrypt_bookmarks(true);  // Non-passwords = encrypt everything
 
   EXPECT_CALL(*observer(),
               OnEncryptedTypesChanged(
                   HasModelTypes(EncryptableUserTypes()), true));
 
   EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());
   ModelTypeSet encrypted_types =
       encryption_handler()->GetEncryptedTypesUnsafe();
-  EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(PASSWORDS)));
+  EXPECT_TRUE(encrypted_types.Equals(
+      ModelTypeSet(PASSWORDS, WIFI_CREDENTIALS)));
 
   {
     WriteTransaction trans(FROM_HERE, user_share());
     encryption_handler()->UpdateEncryptedTypesFromNigori(
         nigori,
         trans.GetWrappedTrans());
   }
 
   EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled());
   encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe();
@@ skipping 23 matching lines @@
       SyncEncryptionHandler::SensitiveTypes();
   expected_encrypted_types.Put(BOOKMARKS);
 
   EXPECT_CALL(*observer(),
               OnEncryptedTypesChanged(
                   HasModelTypes(expected_encrypted_types), false));
 
   EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());
   ModelTypeSet encrypted_types =
       encryption_handler()->GetEncryptedTypesUnsafe();
-  EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(PASSWORDS)));
+  EXPECT_TRUE(encrypted_types.Equals(
+      ModelTypeSet(PASSWORDS, WIFI_CREDENTIALS)));
 
   {
     WriteTransaction trans(FROM_HERE, user_share());
     encryption_handler()->UpdateEncryptedTypesFromNigori(
         nigori,
         trans.GetWrappedTrans());
   }
 
   EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());
   encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe();
-  EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(BOOKMARKS, PASSWORDS)));
+  EXPECT_TRUE(encrypted_types.Equals(
+      ModelTypeSet(BOOKMARKS, PASSWORDS, WIFI_CREDENTIALS)));
 }
 
 // Receive an old nigori with old encryption keys and encrypted types. We should
 // not revert our default key or encrypted types, and should post a task to
 // overwrite the existing nigori with the correct data.
 TEST_F(SyncEncryptionHandlerImplTest, ReceiveOldNigori) {
   KeyParams old_key = {"localhost", "dummy", "old"};
   KeyParams current_key = {"localhost", "dummy", "cur"};
 
   // Data for testing encryption/decryption.
@@ skipping 1745 matching lines @@
     encryption_handler()->SetKeystoreKeys(keys,
                                           trans.GetWrappedTrans());
   }
   PumpLoop();
   Mock::VerifyAndClearExpectations(observer());
 
   VerifyMigratedNigoriWithTimestamp(1, CUSTOM_PASSPHRASE, kCustomPass);
 }
 
 }  // namespace syncer