From f7decab76eb17f1db8e2bc0ac1ff62ecf355407d Mon Sep 17 00:00:00 2001
From: tom <tluk@chromium.org>
Date: Mon, 19 Jul 2021 16:32:09 +0000
Subject: [PATCH] CodeHealth: Remove use of Value::GetAsString from
//components
This change removes the use of Value::GetAsString and replaces with
Value::is_string, Value::GetString(), Value::GetIfString().
This CL was uploaded by git cl split.
R=gab@chromium.org
Bug: 1187007
Change-Id: I87ece9233ac22b85a4be04245e4f83b71cc032ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3033194
Auto-Submit: Thomas Lukaszewicz <tluk@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#903028}
---
components/prefs/pref_value_store_unittest.cc | 56 +++++++++----------
1 file changed, 26 insertions(+), 30 deletions(-)
diff --git a/components/prefs/pref_value_store_unittest.cc b/components/prefs/pref_value_store_unittest.cc
index de46efd85655e..39648139c4fd5 100644
--- a/components/prefs/pref_value_store_unittest.cc
+++ b/components/prefs/pref_value_store_unittest.cc
@@ -268,52 +268,50 @@ TEST_F(PrefValueStoreTest, GetValue) {
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kManagedPref,
base::Value::Type::STRING, &value));
- std::string actual_str_value;
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(managed_pref::kManagedValue, actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(managed_pref::kManagedValue, value->GetString());
// Test getting a supervised user value.
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kSupervisedUserPref,
base::Value::Type::STRING, &value));
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(supervised_user_pref::kSupervisedUserValue, actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(supervised_user_pref::kSupervisedUserValue, value->GetString());
// Test getting an extension value.
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kExtensionPref,
base::Value::Type::STRING, &value));
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(extension_pref::kExtensionValue, actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(extension_pref::kExtensionValue, value->GetString());
// Test getting a command-line value.
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kCommandLinePref,
base::Value::Type::STRING, &value));
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(command_line_pref::kCommandLineValue, actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(command_line_pref::kCommandLineValue, value->GetString());
// Test getting a user-set value.
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kUserPref,
base::Value::Type::STRING, &value));
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(user_pref::kUserValue, actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(user_pref::kUserValue, value->GetString());
// Test getting a user set value overwriting a recommended value.
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kRecommendedPref,
base::Value::Type::STRING, &value));
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(recommended_pref::kRecommendedValue,
- actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(recommended_pref::kRecommendedValue, value->GetString());
// Test getting a default value.
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kDefaultPref,
base::Value::Type::STRING, &value));
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(default_pref::kDefaultValue, actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(default_pref::kDefaultValue, value->GetString());
// Test getting a preference value that the |PrefValueStore|
// does not contain.
@@ -336,50 +334,48 @@ TEST_F(PrefValueStoreTest, GetRecommendedValue) {
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kManagedPref,
base::Value::Type::STRING, &value));
- std::string actual_str_value;
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(recommended_pref::kManagedValue, actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(recommended_pref::kManagedValue, value->GetString());
// Test getting recommended value when a supervised user value is present.
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kSupervisedUserPref,
base::Value::Type::STRING, &value));
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(recommended_pref::kSupervisedUserValue, actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(recommended_pref::kSupervisedUserValue, value->GetString());
// Test getting recommended value when an extension value is present.
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kExtensionPref,
base::Value::Type::STRING, &value));
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(recommended_pref::kExtensionValue, actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(recommended_pref::kExtensionValue, value->GetString());
// Test getting recommended value when a command-line value is present.
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kCommandLinePref,
base::Value::Type::STRING, &value));
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(recommended_pref::kCommandLineValue, actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(recommended_pref::kCommandLineValue, value->GetString());
// Test getting recommended value when a user-set value is present.
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kUserPref,
base::Value::Type::STRING, &value));
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(recommended_pref::kUserValue, actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(recommended_pref::kUserValue, value->GetString());
// Test getting recommended value when no higher-priority value is present.
value = nullptr;
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kRecommendedPref,
base::Value::Type::STRING, &value));
- EXPECT_TRUE(value->GetAsString(&actual_str_value));
- EXPECT_EQ(recommended_pref::kRecommendedValue,
- actual_str_value);
+ ASSERT_TRUE(value->is_string());
+ EXPECT_EQ(recommended_pref::kRecommendedValue, value->GetString());
// Test getting recommended value when no recommended value is present.
base::Value tmp_dummy_value(true);