| Index: chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
|
| diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
|
| index 2e799939d057d7ed9ed9e4c11fe54f00a8379756..1fc047d77fb3f36190b2514012e61b4e442f01ac 100644
|
| --- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
|
| +++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
|
| @@ -22,7 +22,7 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| using base::DictionaryValue;
|
| -using base::FundamentalValue;
|
| +using base::Value;
|
| using base::StringValue;
|
| using base::Value;
|
| using sync_pb::ManagedUserSharedSettingSpecifics;
|
| @@ -162,12 +162,12 @@ TEST_F(SupervisedUserSharedSettingsServiceTest, SetAndGet) {
|
| const char kIdC[] = "cccccc";
|
|
|
| StringValue name("Jack");
|
| - FundamentalValue age(8);
|
| + Value age(8);
|
| StringValue bar("bar");
|
| settings_service_.SetValue(kIdA, "name", name);
|
| ASSERT_EQ(1u, sync_processor_->changes().size());
|
| VerifySyncChangesAndClear();
|
| - settings_service_.SetValue(kIdA, "age", FundamentalValue(6));
|
| + settings_service_.SetValue(kIdA, "age", Value(6));
|
| ASSERT_EQ(1u, sync_processor_->changes().size());
|
| VerifySyncChangesAndClear();
|
| settings_service_.SetValue(kIdA, "age", age);
|
| @@ -202,7 +202,7 @@ TEST_F(SupervisedUserSharedSettingsServiceTest, Merge) {
|
| const char kIdB[] = "bbbbbb";
|
| const char kIdC[] = "cccccc";
|
|
|
| - FundamentalValue age(8);
|
| + Value age(8);
|
| StringValue bar("bar");
|
| settings_service_.SetValue(kIdA, "name", StringValue("Jack"));
|
| settings_service_.SetValue(kIdA, "age", age);
|
| @@ -252,7 +252,7 @@ TEST_F(SupervisedUserSharedSettingsServiceTest, ProcessChanges) {
|
| const char kIdB[] = "bbbbbb";
|
| const char kIdC[] = "cccccc";
|
|
|
| - FundamentalValue age(8);
|
| + Value age(8);
|
| StringValue bar("bar");
|
| settings_service_.SetValue(kIdA, "name", StringValue("Jack"));
|
| settings_service_.SetValue(kIdA, "age", age);
|
|
|