Remove base::StringValue

components/policy/core/browser/android/policy_converter_unittest.cc

 // Copyright 2015 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 <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "components/policy/core/browser/android/policy_converter.h"
 #include "components/policy/core/common/schema.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::DictionaryValue;
 using base::ListValue;
-using base::StringValue;
 using base::Value;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace policy {
 namespace android {
 
 class PolicyConverterTest : public testing::Test {
  public:
   void SetUp() override {
@@ skipping 63 matching lines @@
     return ScopedJavaLocalRef<jobjectArray>(env, java_array);
   }
 
   Schema schema_;
 };
 
 TEST_F(PolicyConverterTest, ConvertToNullValue) {
   Schema null_schema = schema_.GetKnownProperty("null");
   ASSERT_TRUE(null_schema.valid());
 
-  EXPECT_EQ("null", Convert(new StringValue("foo"), null_schema));
+  EXPECT_EQ("null", Convert(new Value("foo"), null_schema));
 }
 
 TEST_F(PolicyConverterTest, ConvertToBoolValue) {
   Schema bool_schema = schema_.GetKnownProperty("bool");
   ASSERT_TRUE(bool_schema.valid());
 
   EXPECT_EQ("true", Convert(new Value(true), bool_schema));
   EXPECT_EQ("false", Convert(new Value(false), bool_schema));
-  EXPECT_EQ("true", Convert(new StringValue("true"), bool_schema));
-  EXPECT_EQ("false", Convert(new StringValue("false"), bool_schema));
-  EXPECT_EQ("\"narf\"", Convert(new StringValue("narf"), bool_schema));
+  EXPECT_EQ("true", Convert(new Value("true"), bool_schema));
+  EXPECT_EQ("false", Convert(new Value("false"), bool_schema));
+  EXPECT_EQ("\"narf\"", Convert(new Value("narf"), bool_schema));
   EXPECT_EQ("false", Convert(new Value(0), bool_schema));
   EXPECT_EQ("true", Convert(new Value(1), bool_schema));
   EXPECT_EQ("true", Convert(new Value(42), bool_schema));
   EXPECT_EQ("true", Convert(new Value(-1), bool_schema));
-  EXPECT_EQ("\"1\"", Convert(new StringValue("1"), bool_schema));
+  EXPECT_EQ("\"1\"", Convert(new Value("1"), bool_schema));
   EXPECT_EQ("{}", Convert(new DictionaryValue(), bool_schema));
 }
 
 TEST_F(PolicyConverterTest, ConvertToIntValue) {
   Schema int_schema = schema_.GetKnownProperty("int");
   ASSERT_TRUE(int_schema.valid());
 
   EXPECT_EQ("23", Convert(new Value(23), int_schema));
-  EXPECT_EQ("42", Convert(new StringValue("42"), int_schema));
-  EXPECT_EQ("-1", Convert(new StringValue("-1"), int_schema));
-  EXPECT_EQ("\"poit\"", Convert(new StringValue("poit"), int_schema));
+  EXPECT_EQ("42", Convert(new Value("42"), int_schema));
+  EXPECT_EQ("-1", Convert(new Value("-1"), int_schema));
+  EXPECT_EQ("\"poit\"", Convert(new Value("poit"), int_schema));
   EXPECT_EQ("false", Convert(new Value(false), int_schema));
 }
 
 TEST_F(PolicyConverterTest, ConvertToDoubleValue) {
   Schema double_schema = schema_.GetKnownProperty("double");
   ASSERT_TRUE(double_schema.valid());
 
   EXPECT_EQ("3", Convert(new Value(3), double_schema));
   EXPECT_EQ("3.14", Convert(new Value(3.14), double_schema));
-  EXPECT_EQ("2.71", Convert(new StringValue("2.71"), double_schema));
-  EXPECT_EQ("\"zort\"", Convert(new StringValue("zort"), double_schema));
+  EXPECT_EQ("2.71", Convert(new Value("2.71"), double_schema));
+  EXPECT_EQ("\"zort\"", Convert(new Value("zort"), double_schema));
   EXPECT_EQ("true", Convert(new Value(true), double_schema));
 }
 
 TEST_F(PolicyConverterTest, ConvertToStringValue) {
   Schema string_schema = schema_.GetKnownProperty("string");
   ASSERT_TRUE(string_schema.valid());
 
-  EXPECT_EQ("\"troz\"", Convert(new StringValue("troz"), string_schema));
+  EXPECT_EQ("\"troz\"", Convert(new Value("troz"), string_schema));
   EXPECT_EQ("4711", Convert(new Value(4711), string_schema));
 }
 
 TEST_F(PolicyConverterTest, ConvertToListValue) {
   Schema list_schema = schema_.GetKnownProperty("list");
   ASSERT_TRUE(list_schema.valid());
 
   ListValue* list = new ListValue;
   list->AppendString("foo");
   list->AppendString("bar");
   EXPECT_EQ("[\"foo\",\"bar\"]", Convert(list, list_schema));
   EXPECT_EQ("[\"baz\",\"blurp\"]",
-            Convert(new StringValue("[\"baz\", \"blurp\"]"), list_schema));
-  EXPECT_EQ("\"hurz\"", Convert(new StringValue("hurz"), list_schema));
+            Convert(new Value("[\"baz\", \"blurp\"]"), list_schema));
+  EXPECT_EQ("\"hurz\"", Convert(new Value("hurz"), list_schema));
   EXPECT_EQ("19", Convert(new Value(19), list_schema));
 }
 
 TEST_F(PolicyConverterTest, ConvertFromJavaListToListValue) {
   JNIEnv* env = base::android::AttachCurrentThread();
   EXPECT_EQ("[\"foo\",\"bar\",\"baz\"]",
             ConvertJavaStringArrayToListValue(
                 env, MakeJavaStringArray(env, {"foo", "bar", "baz"})));
   EXPECT_EQ("[]", ConvertJavaStringArrayToListValue(
                       env, MakeJavaStringArray(env, {})));
 }
 
 TEST_F(PolicyConverterTest, ConvertToDictionaryValue) {
   Schema dict_schema = schema_.GetKnownProperty("dict");
   ASSERT_TRUE(dict_schema.valid());
 
   DictionaryValue* dict = new DictionaryValue;
   dict->SetInteger("thx", 1138);
   EXPECT_EQ("{\"thx\":1138}", Convert(dict, dict_schema));
   EXPECT_EQ("{\"moose\":true}",
-            Convert(new StringValue("{\"moose\": true}"), dict_schema));
-  EXPECT_EQ("\"fnord\"", Convert(new StringValue("fnord"), dict_schema));
+            Convert(new Value("{\"moose\": true}"), dict_schema));
+  EXPECT_EQ("\"fnord\"", Convert(new Value("fnord"), dict_schema));
   EXPECT_EQ("1729", Convert(new Value(1729), dict_schema));
 }
 
 }  // namespace android
 }  // namespace policy