| Index: components/sync/base/nigori_unittest.cc
|
| diff --git a/sync/util/nigori_unittest.cc b/components/sync/base/nigori_unittest.cc
|
| similarity index 91%
|
| rename from sync/util/nigori_unittest.cc
|
| rename to components/sync/base/nigori_unittest.cc
|
| index 0853fe40630cff26daf9b23cdd14b72ed0f86444..b708924e8fce23418c40518501cf63684553dd0b 100644
|
| --- a/sync/util/nigori_unittest.cc
|
| +++ b/components/sync/base/nigori_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/util/nigori.h"
|
| +#include "components/sync/base/nigori.h"
|
|
|
| #include <string>
|
|
|
| @@ -17,8 +17,7 @@ TEST(SyncNigoriTest, Permute) {
|
| EXPECT_TRUE(nigori.InitByDerivation("example.com", "username", "password"));
|
|
|
| std::string permuted;
|
| - EXPECT_TRUE(nigori.Permute(Nigori::Password, "test name",
|
| - &permuted));
|
| + EXPECT_TRUE(nigori.Permute(Nigori::Password, "test name", &permuted));
|
|
|
| std::string expected =
|
| "prewwdJj2PrGDczvmsHJEE5ndcCyVze8sY9kD5hjY/Tm"
|
| @@ -31,17 +30,13 @@ TEST(SyncNigoriTest, PermuteIsConstant) {
|
| EXPECT_TRUE(nigori1.InitByDerivation("example.com", "username", "password"));
|
|
|
| std::string permuted1;
|
| - EXPECT_TRUE(nigori1.Permute(Nigori::Password,
|
| - "name",
|
| - &permuted1));
|
| + EXPECT_TRUE(nigori1.Permute(Nigori::Password, "name", &permuted1));
|
|
|
| Nigori nigori2;
|
| EXPECT_TRUE(nigori2.InitByDerivation("example.com", "username", "password"));
|
|
|
| std::string permuted2;
|
| - EXPECT_TRUE(nigori2.Permute(Nigori::Password,
|
| - "name",
|
| - &permuted2));
|
| + EXPECT_TRUE(nigori2.Permute(Nigori::Password, "name", &permuted2));
|
|
|
| EXPECT_LT(0U, permuted1.size());
|
| EXPECT_EQ(permuted1, permuted2);
|
|
|