[sync] Fix decryption failure caused by missing user_key

components/sync/base/nigori_unittest.cc

 // Copyright (c) 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 "components/sync/base/nigori.h"
 
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
@@ skipping 108 matching lines @@
   std::string decrypted;
   EXPECT_FALSE(nigori.Decrypt(encrypted, &decrypted));
 
   EXPECT_NE(plaintext, decrypted);
 }
 
 TEST(SyncNigoriTest, ExportImport) {
   Nigori nigori1;
   EXPECT_TRUE(nigori1.InitByDerivation("example.com", "username", "password"));
 
+  std::string user_key;
   std::string encryption_key;
   std::string mac_key;
-  EXPECT_TRUE(nigori1.ExportKeys(&encryption_key, &mac_key));
+  EXPECT_TRUE(nigori1.ExportKeys(&user_key, &encryption_key, &mac_key));
 
   Nigori nigori2;
-  EXPECT_TRUE(nigori2.InitByImport(encryption_key, mac_key));
+  EXPECT_TRUE(nigori2.InitByImport(user_key, encryption_key, mac_key));
 
   std::string original("test");
   std::string plaintext;
   std::string ciphertext;
 
   EXPECT_TRUE(nigori1.Encrypt(original, &ciphertext));
   EXPECT_TRUE(nigori2.Decrypt(ciphertext, &plaintext));
   EXPECT_EQ(original, plaintext);
 
   EXPECT_TRUE(nigori2.Encrypt(original, &ciphertext));
   EXPECT_TRUE(nigori1.Decrypt(ciphertext, &plaintext));
   EXPECT_EQ(original, plaintext);
 
   std::string permuted1, permuted2;
   EXPECT_TRUE(nigori1.Permute(Nigori::Password, original, &permuted1));
   EXPECT_TRUE(nigori2.Permute(Nigori::Password, original, &permuted2));
   EXPECT_EQ(permuted1, permuted2);
 }
 
+TEST(SyncNigoriTest, InitByDerivationSetsUserKey) {
+  Nigori nigori;
+  EXPECT_TRUE(nigori.InitByDerivation("example.com", "username", "password"));
+
+  std::string user_key = "";
+  std::string encryption_key;
+  std::string mac_key;
+  EXPECT_TRUE(nigori.ExportKeys(&user_key, &encryption_key, &mac_key));
+
+  EXPECT_NE(user_key, "");
+}
+
+TEST(SyncNigoriTest, InitByImportToleratesEmptyUserKey) {
+  Nigori nigori1;
+  EXPECT_TRUE(nigori1.InitByDerivation("example.com", "username", "password"));
+
+  std::string user_key;
+  std::string encryption_key;
+  std::string mac_key;
+  EXPECT_TRUE(nigori1.ExportKeys(&user_key, &encryption_key, &mac_key));
+
+  Nigori nigori2;
+  EXPECT_TRUE(nigori2.InitByImport("", encryption_key, mac_key));
+}
+
 }  // anonymous namespace
 }  // namespace syncer