Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1274)

Unified Diff: chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc
index 83173f68a9b2219fc6e42d2b4460895cf6ffefd1..f8045716c72e59920b316b3e97a09870955cdfb5 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc
@@ -32,15 +32,14 @@ class SupervisedUserSharedSettingsUpdateTest : public testing::Test {
TEST_F(SupervisedUserSharedSettingsUpdateTest, Success) {
SupervisedUserSharedSettingsUpdate update(
&service_, "abcdef", "name",
- std::unique_ptr<base::Value>(new base::StringValue("Hans Moleman")),
+ std::unique_ptr<base::Value>(new base::Value("Hans Moleman")),
base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
base::Unretained(this)));
syncer::SyncChangeList changes;
changes.push_back(syncer::SyncChange(
- FROM_HERE,
- syncer::SyncChange::ACTION_UPDATE,
+ FROM_HERE, syncer::SyncChange::ACTION_UPDATE,
SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
- "abcdef", "name", base::StringValue("Hans Moleman"), true)));
+ "abcdef", "name", base::Value("Hans Moleman"), true)));
syncer::SyncError error = service_.ProcessSyncChanges(FROM_HERE, changes);
EXPECT_FALSE(error.IsSet()) << error.ToString();
ASSERT_TRUE(result_);
@@ -50,20 +49,16 @@ TEST_F(SupervisedUserSharedSettingsUpdateTest, Success) {
TEST_F(SupervisedUserSharedSettingsUpdateTest, Failure) {
SupervisedUserSharedSettingsUpdate update(
&service_, "abcdef", "name",
- std::unique_ptr<base::Value>(new base::StringValue("Hans Moleman")),
+ std::unique_ptr<base::Value>(new base::Value("Hans Moleman")),
base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
base::Unretained(this)));
// Syncing down a different change will cause the update to fail.
syncer::SyncChangeList changes;
changes.push_back(syncer::SyncChange(
- FROM_HERE,
- syncer::SyncChange::ACTION_UPDATE,
+ FROM_HERE, syncer::SyncChange::ACTION_UPDATE,
SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
- "abcdef",
- "name",
- base::StringValue("Barney Gumble"),
- true)));
+ "abcdef", "name", base::Value("Barney Gumble"), true)));
syncer::SyncError error = service_.ProcessSyncChanges(FROM_HERE, changes);
EXPECT_FALSE(error.IsSet()) << error.ToString();
ASSERT_TRUE(result_);
@@ -74,7 +69,7 @@ TEST_F(SupervisedUserSharedSettingsUpdateTest, Cancel) {
{
SupervisedUserSharedSettingsUpdate update(
&service_, "abcdef", "name",
- std::unique_ptr<base::Value>(new base::StringValue("Hans Moleman")),
+ std::unique_ptr<base::Value>(new base::Value("Hans Moleman")),
base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
base::Unretained(this)));
ASSERT_FALSE(result_);

Powered by Google App Engine
This is Rietveld 408576698