Remove base::StringValue

chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc

 // Copyright 2014 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 "chrome/browser/supervised_user/supervised_user_settings_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 67 matching lines @@
         syncer::SUPERVISED_USER_SETTINGS, initial_sync_data,
         CreateSyncProcessor(), std::move(error_handler));
     EXPECT_FALSE(result.error().IsSet());
     return result;
   }
 
   void UploadSplitItem(const std::string& key, const std::string& value) {
     split_items_.SetStringWithoutPathExpansion(key, value);
     settings_service_.UploadItem(
         SupervisedUserSettingsService::MakeSplitSettingKey(kSplitItemName, key),
-        std::unique_ptr<base::Value>(new base::StringValue(value)));
+        std::unique_ptr<base::Value>(new base::Value(value)));
   }
 
   void UploadAtomicItem(const std::string& value) {
-    atomic_setting_value_.reset(new base::StringValue(value));
+    atomic_setting_value_.reset(new base::Value(value));
     settings_service_.UploadItem(
-        kAtomicItemName,
-        std::unique_ptr<base::Value>(new base::StringValue(value)));
+        kAtomicItemName, std::unique_ptr<base::Value>(new base::Value(value)));
   }
 
   void VerifySyncDataItem(syncer::SyncData sync_data) {
     const sync_pb::ManagedUserSettingSpecifics& supervised_user_setting =
         sync_data.GetSpecifics().managed_user_setting();
     base::Value* expected_value = nullptr;
     if (supervised_user_setting.name() == kAtomicItemName) {
       expected_value = atomic_setting_value_.get();
     } else {
       EXPECT_TRUE(base::StartsWith(supervised_user_setting.name(),
@@ skipping 45 matching lines @@
 
 TEST_F(SupervisedUserSettingsServiceTest, ProcessAtomicSetting) {
   StartSyncing(syncer::SyncDataList());
   ASSERT_TRUE(settings_);
   const base::Value* value = nullptr;
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSettingsName, &value));
 
   settings_.reset();
   syncer::SyncData data =
       SupervisedUserSettingsService::CreateSyncDataForSetting(
-          kSettingsName, base::StringValue(kSettingsValue));
+          kSettingsName, base::Value(kSettingsValue));
   syncer::SyncChangeList change_list;
   change_list.push_back(
       syncer::SyncChange(FROM_HERE, syncer::SyncChange::ACTION_ADD, data));
   syncer::SyncError error =
       settings_service_.ProcessSyncChanges(FROM_HERE, change_list);
   EXPECT_FALSE(error.IsSet()) << error.ToString();
   ASSERT_TRUE(settings_);
   ASSERT_TRUE(settings_->GetWithoutPathExpansion(kSettingsName, &value));
   std::string string_value;
   EXPECT_TRUE(value->GetAsString(&string_value));
@@ skipping 43 matching lines @@
   ASSERT_TRUE(settings_);
   const base::Value* value = nullptr;
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSettingsName, &value));
 
   settings_.reset();
 
   {
     syncer::SyncDataList sync_data;
     // Adding 1 Atomic entry.
     sync_data.push_back(SupervisedUserSettingsService::CreateSyncDataForSetting(
-        kSettingsName, base::StringValue(kSettingsValue)));
+        kSettingsName, base::Value(kSettingsValue)));
     // Adding 2 SplitSettings from dictionary.
     base::DictionaryValue dict;
     dict.SetString("foo", "bar");
     dict.SetInteger("eaudecologne", 4711);
     for (base::DictionaryValue::Iterator it(dict); !it.IsAtEnd();
          it.Advance()) {
       sync_data.push_back(
           SupervisedUserSettingsService::CreateSyncDataForSetting(
               SupervisedUserSettingsService::MakeSplitSettingKey(kSplitItemName,
                                                                  it.key()),
@@ skipping 38 matching lines @@
   }
 }
 
 TEST_F(SupervisedUserSettingsServiceTest, SetLocalSetting) {
   const base::Value* value = nullptr;
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSettingsName, &value));
 
   settings_.reset();
   settings_service_.SetLocalSetting(
       kSettingsName,
-      std::unique_ptr<base::Value>(new base::StringValue(kSettingsValue)));
+      std::unique_ptr<base::Value>(new base::Value(kSettingsValue)));
   ASSERT_TRUE(settings_);
   ASSERT_TRUE(settings_->GetWithoutPathExpansion(kSettingsName, &value));
   std::string string_value;
   EXPECT_TRUE(value->GetAsString(&string_value));
   EXPECT_EQ(kSettingsValue, string_value);
 }
 
 TEST_F(SupervisedUserSettingsServiceTest, UploadItem) {
   UploadSplitItem("foo", "bar");
   UploadSplitItem("blurp", "baz");
@@ skipping 63 matching lines @@
   // The uploaded items should not show up as settings.
   const base::Value* value = nullptr;
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kAtomicItemName, &value));
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSplitItemName, &value));
 
   // Restarting sync should not create any new changes.
   settings_service_.StopSyncing(syncer::SUPERVISED_USER_SETTINGS);
   StartSyncing(sync_data);
   ASSERT_EQ(0u, sync_processor_->changes().size());
 }