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 cfed6f0f2a7efd5fd6b7bc1e8288a311511947db..2c6b4b1a0a8c74adc0f3771df6caddd4e684da21 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,6 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
using base::DictionaryValue; |
-using base::StringValue; |
using base::Value; |
using sync_pb::ManagedUserSharedSettingSpecifics; |
using syncer::SUPERVISED_USER_SHARED_SETTINGS; |
@@ -160,9 +159,9 @@ TEST_F(SupervisedUserSharedSettingsServiceTest, SetAndGet) { |
const char kIdB[] = "bbbbbb"; |
const char kIdC[] = "cccccc"; |
- StringValue name("Jack"); |
+ Value name("Jack"); |
Value age(8); |
- StringValue bar("bar"); |
+ Value bar("bar"); |
settings_service_.SetValue(kIdA, "name", name); |
ASSERT_EQ(1u, sync_processor_->changes().size()); |
VerifySyncChangesAndClear(); |
@@ -202,15 +201,15 @@ TEST_F(SupervisedUserSharedSettingsServiceTest, Merge) { |
const char kIdC[] = "cccccc"; |
Value age(8); |
- StringValue bar("bar"); |
- settings_service_.SetValue(kIdA, "name", StringValue("Jack")); |
+ Value bar("bar"); |
+ settings_service_.SetValue(kIdA, "name", Value("Jack")); |
settings_service_.SetValue(kIdA, "age", age); |
settings_service_.SetValue(kIdB, "foo", bar); |
settings_service_.StopSyncing(SUPERVISED_USER_SHARED_SETTINGS); |
- StringValue name("Jill"); |
- StringValue blurp("blurp"); |
+ Value name("Jill"); |
+ Value blurp("blurp"); |
SyncDataList sync_data; |
sync_data.push_back( |
SupervisedUserSharedSettingsService::CreateSyncDataForSetting( |
@@ -252,13 +251,13 @@ TEST_F(SupervisedUserSharedSettingsServiceTest, ProcessChanges) { |
const char kIdC[] = "cccccc"; |
Value age(8); |
- StringValue bar("bar"); |
- settings_service_.SetValue(kIdA, "name", StringValue("Jack")); |
+ Value bar("bar"); |
+ settings_service_.SetValue(kIdA, "name", Value("Jack")); |
settings_service_.SetValue(kIdA, "age", age); |
settings_service_.SetValue(kIdB, "foo", bar); |
- StringValue name("Jill"); |
- StringValue blurp("blurp"); |
+ Value name("Jill"); |
+ Value blurp("blurp"); |
SyncChangeList changes; |
changes.push_back( |
SyncChange(FROM_HERE, |