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

Unified Diff: components/policy/core/browser/android/policy_converter.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 10 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: components/policy/core/browser/android/policy_converter.cc
diff --git a/components/policy/core/browser/android/policy_converter.cc b/components/policy/core/browser/android/policy_converter.cc
index afdac494bad19f043a7f52254a7cd1da1b3d0475..ef46e598812b427665d3c399f1e090e05411c548 100644
--- a/components/policy/core/browser/android/policy_converter.cc
+++ b/components/policy/core/browser/android/policy_converter.cc
@@ -56,18 +56,16 @@ void PolicyConverter::SetPolicyBoolean(JNIEnv* env,
const JavaRef<jobject>& obj,
const JavaRef<jstring>& policyKey,
jboolean value) {
- SetPolicyValue(
- ConvertJavaStringToUTF8(env, policyKey),
- base::MakeUnique<base::FundamentalValue>(static_cast<bool>(value)));
+ SetPolicyValue(ConvertJavaStringToUTF8(env, policyKey),
+ base::MakeUnique<base::Value>(static_cast<bool>(value)));
}
void PolicyConverter::SetPolicyInteger(JNIEnv* env,
const JavaRef<jobject>& obj,
const JavaRef<jstring>& policyKey,
jint value) {
- SetPolicyValue(
- ConvertJavaStringToUTF8(env, policyKey),
- base::MakeUnique<base::FundamentalValue>(static_cast<int>(value)));
+ SetPolicyValue(ConvertJavaStringToUTF8(env, policyKey),
+ base::MakeUnique<base::Value>(static_cast<int>(value)));
}
void PolicyConverter::SetPolicyString(JNIEnv* env,
@@ -121,16 +119,16 @@ std::unique_ptr<base::Value> PolicyConverter::ConvertValueToSchema(
std::string string_value;
if (value->GetAsString(&string_value)) {
if (string_value.compare("true") == 0)
- return base::MakeUnique<base::FundamentalValue>(true);
+ return base::MakeUnique<base::Value>(true);
if (string_value.compare("false") == 0)
- return base::MakeUnique<base::FundamentalValue>(false);
+ return base::MakeUnique<base::Value>(false);
return value;
}
int int_value = 0;
if (value->GetAsInteger(&int_value))
- return base::MakeUnique<base::FundamentalValue>(int_value != 0);
+ return base::MakeUnique<base::Value>(int_value != 0);
return value;
}
@@ -140,7 +138,7 @@ std::unique_ptr<base::Value> PolicyConverter::ConvertValueToSchema(
if (value->GetAsString(&string_value)) {
int int_value = 0;
if (base::StringToInt(string_value, &int_value))
- return base::MakeUnique<base::FundamentalValue>(int_value);
+ return base::MakeUnique<base::Value>(int_value);
}
return value;
}
@@ -150,7 +148,7 @@ std::unique_ptr<base::Value> PolicyConverter::ConvertValueToSchema(
if (value->GetAsString(&string_value)) {
double double_value = 0;
if (base::StringToDouble(string_value, &double_value))
- return base::MakeUnique<base::FundamentalValue>(double_value);
+ return base::MakeUnique<base::Value>(double_value);
}
return value;
}

Powered by Google App Engine
This is Rietveld 408576698