Remove base::BinaryValue
As a follow-up to typedeffing base::BinaryValue to base::Value in
http://crrev.com/2689673002 this change replaces all references to
base::StringValue by base::Value. Also it adds missing #includes of base/values.h.
BUG=646113
Review-Url: https://codereview.chromium.org/2799093006
Cr-Commit-Position: refs/heads/master@{#463568}
CrOS-Libchrome-Original-Commit: 14b25da4874f20bb712e927b56d66593b5280164
diff --git a/base/json/json_writer_unittest.cc b/base/json/json_writer_unittest.cc
index de4ab61..1b57e06 100644
--- a/base/json/json_writer_unittest.cc
+++ b/base/json/json_writer_unittest.cc
@@ -111,29 +111,29 @@
// Binary values should return errors unless suppressed via the
// OPTIONS_OMIT_BINARY_VALUES flag.
- std::unique_ptr<Value> root(BinaryValue::CreateWithCopiedBuffer("asdf", 4));
+ std::unique_ptr<Value> root(Value::CreateWithCopiedBuffer("asdf", 4));
EXPECT_FALSE(JSONWriter::Write(*root, &output_js));
EXPECT_TRUE(JSONWriter::WriteWithOptions(
*root, JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js));
EXPECT_TRUE(output_js.empty());
ListValue binary_list;
- binary_list.Append(BinaryValue::CreateWithCopiedBuffer("asdf", 4));
+ binary_list.Append(Value::CreateWithCopiedBuffer("asdf", 4));
binary_list.Append(MakeUnique<Value>(5));
- binary_list.Append(BinaryValue::CreateWithCopiedBuffer("asdf", 4));
+ binary_list.Append(Value::CreateWithCopiedBuffer("asdf", 4));
binary_list.Append(MakeUnique<Value>(2));
- binary_list.Append(BinaryValue::CreateWithCopiedBuffer("asdf", 4));
+ binary_list.Append(Value::CreateWithCopiedBuffer("asdf", 4));
EXPECT_FALSE(JSONWriter::Write(binary_list, &output_js));
EXPECT_TRUE(JSONWriter::WriteWithOptions(
binary_list, JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js));
EXPECT_EQ("[5,2]", output_js);
DictionaryValue binary_dict;
- binary_dict.Set("a", BinaryValue::CreateWithCopiedBuffer("asdf", 4));
+ binary_dict.Set("a", Value::CreateWithCopiedBuffer("asdf", 4));
binary_dict.SetInteger("b", 5);
- binary_dict.Set("c", BinaryValue::CreateWithCopiedBuffer("asdf", 4));
+ binary_dict.Set("c", Value::CreateWithCopiedBuffer("asdf", 4));
binary_dict.SetInteger("d", 2);
- binary_dict.Set("e", BinaryValue::CreateWithCopiedBuffer("asdf", 4));
+ binary_dict.Set("e", Value::CreateWithCopiedBuffer("asdf", 4));
EXPECT_FALSE(JSONWriter::Write(binary_dict, &output_js));
EXPECT_TRUE(JSONWriter::WriteWithOptions(
binary_dict, JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js));
diff --git a/base/trace_event/trace_event_memory_overhead.cc b/base/trace_event/trace_event_memory_overhead.cc
index 8d56e1d..ffc4c08 100644
--- a/base/trace_event/trace_event_memory_overhead.cc
+++ b/base/trace_event/trace_event_memory_overhead.cc
@@ -84,9 +84,9 @@
} break;
case Value::Type::BINARY: {
- const BinaryValue* binary_value = nullptr;
+ const Value* binary_value = nullptr;
value.GetAsBinary(&binary_value);
- Add("BinaryValue", sizeof(BinaryValue) + binary_value->GetSize());
+ Add("BinaryValue", sizeof(Value) + binary_value->GetSize());
} break;
case Value::Type::DICTIONARY: {
diff --git a/base/values.cc b/base/values.cc
index 23d2b38..ca12edc 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -76,10 +76,9 @@
} // namespace
// static
-std::unique_ptr<BinaryValue> BinaryValue::CreateWithCopiedBuffer(
- const char* buffer,
- size_t size) {
- return MakeUnique<BinaryValue>(std::vector<char>(buffer, buffer + size));
+std::unique_ptr<Value> Value::CreateWithCopiedBuffer(const char* buffer,
+ size_t size) {
+ return MakeUnique<Value>(std::vector<char>(buffer, buffer + size));
}
Value::Value(const Value& that) {
@@ -298,7 +297,7 @@
return is_string();
}
-bool Value::GetAsBinary(const BinaryValue** out_value) const {
+bool Value::GetAsBinary(const Value** out_value) const {
if (out_value && is_blob()) {
*out_value = this;
return true;
@@ -795,7 +794,7 @@
}
bool DictionaryValue::GetBinary(StringPiece path,
- const BinaryValue** out_value) const {
+ const Value** out_value) const {
const Value* value;
bool result = Get(path, &value);
if (!result || !value->IsType(Type::BINARY))
@@ -807,10 +806,9 @@
return true;
}
-bool DictionaryValue::GetBinary(StringPiece path, BinaryValue** out_value) {
+bool DictionaryValue::GetBinary(StringPiece path, Value** out_value) {
return static_cast<const DictionaryValue&>(*this).GetBinary(
- path,
- const_cast<const BinaryValue**>(out_value));
+ path, const_cast<const Value**>(out_value));
}
bool DictionaryValue::GetDictionary(StringPiece path,
@@ -1156,7 +1154,7 @@
return value->GetAsString(out_value);
}
-bool ListValue::GetBinary(size_t index, const BinaryValue** out_value) const {
+bool ListValue::GetBinary(size_t index, const Value** out_value) const {
const Value* value;
bool result = Get(index, &value);
if (!result || !value->IsType(Type::BINARY))
@@ -1168,10 +1166,9 @@
return true;
}
-bool ListValue::GetBinary(size_t index, BinaryValue** out_value) {
+bool ListValue::GetBinary(size_t index, Value** out_value) {
return static_cast<const ListValue&>(*this).GetBinary(
- index,
- const_cast<const BinaryValue**>(out_value));
+ index, const_cast<const Value**>(out_value));
}
bool ListValue::GetDictionary(size_t index,
diff --git a/base/values.h b/base/values.h
index 9509c95..ace8b43 100644
--- a/base/values.h
+++ b/base/values.h
@@ -40,7 +40,6 @@
class DictionaryValue;
class ListValue;
class Value;
-using BinaryValue = Value;
// The Value class is the base class for Values. A Value can be instantiated
// via the Create*Value() factory methods, or by directly creating instances of
@@ -69,8 +68,8 @@
// buffer that's passed in.
// DEPRECATED, use MakeUnique<Value>(const std::vector<char>&) instead.
// TODO(crbug.com/646113): Delete this and migrate callsites.
- static std::unique_ptr<BinaryValue> CreateWithCopiedBuffer(const char* buffer,
- size_t size);
+ static std::unique_ptr<Value> CreateWithCopiedBuffer(const char* buffer,
+ size_t size);
Value(const Value& that);
Value(Value&& that) noexcept;
@@ -145,7 +144,7 @@
bool GetAsString(string16* out_value) const;
bool GetAsString(const Value** out_value) const;
bool GetAsString(StringPiece* out_value) const;
- bool GetAsBinary(const BinaryValue** out_value) const;
+ bool GetAsBinary(const Value** out_value) const;
// ListValue::From is the equivalent for std::unique_ptr conversions.
bool GetAsList(ListValue** out_value);
bool GetAsList(const ListValue** out_value) const;
@@ -289,8 +288,8 @@
bool GetString(StringPiece path, std::string* out_value) const;
bool GetString(StringPiece path, string16* out_value) const;
bool GetStringASCII(StringPiece path, std::string* out_value) const;
- bool GetBinary(StringPiece path, const BinaryValue** out_value) const;
- bool GetBinary(StringPiece path, BinaryValue** out_value);
+ bool GetBinary(StringPiece path, const Value** out_value) const;
+ bool GetBinary(StringPiece path, Value** out_value);
bool GetDictionary(StringPiece path,
const DictionaryValue** out_value) const;
bool GetDictionary(StringPiece path, DictionaryValue** out_value);
@@ -421,8 +420,8 @@
bool GetDouble(size_t index, double* out_value) const;
bool GetString(size_t index, std::string* out_value) const;
bool GetString(size_t index, string16* out_value) const;
- bool GetBinary(size_t index, const BinaryValue** out_value) const;
- bool GetBinary(size_t index, BinaryValue** out_value);
+ bool GetBinary(size_t index, const Value** out_value) const;
+ bool GetBinary(size_t index, Value** out_value);
bool GetDictionary(size_t index, const DictionaryValue** out_value) const;
bool GetDictionary(size_t index, DictionaryValue** out_value);
bool GetList(size_t index, const ListValue** out_value) const;
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index 2c7ffd6..077f54c 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -100,7 +100,7 @@
}
TEST(ValuesTest, ConstructBinary) {
- BinaryValue value(std::vector<char>({0xF, 0x0, 0x0, 0xB, 0xA, 0x2}));
+ Value value(std::vector<char>({0xF, 0x0, 0x0, 0xB, 0xA, 0x2}));
EXPECT_EQ(Value::Type::BINARY, value.type());
EXPECT_EQ(std::vector<char>({0xF, 0x0, 0x0, 0xB, 0xA, 0x2}), value.GetBlob());
}
@@ -180,8 +180,8 @@
}
TEST(ValuesTest, CopyBinary) {
- BinaryValue value(std::vector<char>({0xF, 0x0, 0x0, 0xB, 0xA, 0x2}));
- BinaryValue copied_value(value);
+ Value value(std::vector<char>({0xF, 0x0, 0x0, 0xB, 0xA, 0x2}));
+ Value copied_value(value);
EXPECT_EQ(value.type(), copied_value.type());
EXPECT_EQ(value.GetBlob(), copied_value.GetBlob());
@@ -300,14 +300,14 @@
TEST(ValuesTest, MoveBinary) {
const std::vector<char> buffer = {0xF, 0x0, 0x0, 0xB, 0xA, 0x2};
- BinaryValue value(buffer);
- BinaryValue moved_value(std::move(value));
+ Value value(buffer);
+ Value moved_value(std::move(value));
EXPECT_EQ(Value::Type::BINARY, moved_value.type());
EXPECT_EQ(buffer, moved_value.GetBlob());
Value blank;
- blank = BinaryValue(buffer);
+ blank = Value(buffer);
EXPECT_EQ(Value::Type::BINARY, blank.type());
EXPECT_EQ(buffer, blank.GetBlob());
}
@@ -451,7 +451,7 @@
// Test the common case of a non-empty buffer
std::vector<char> buffer(15);
char* original_buffer = buffer.data();
- binary.reset(new BinaryValue(std::move(buffer)));
+ binary.reset(new Value(std::move(buffer)));
ASSERT_TRUE(binary.get());
ASSERT_TRUE(binary->GetBuffer());
ASSERT_EQ(original_buffer, binary->GetBuffer());
@@ -459,7 +459,7 @@
char stack_buffer[42];
memset(stack_buffer, '!', 42);
- binary = BinaryValue::CreateWithCopiedBuffer(stack_buffer, 42);
+ binary = Value::CreateWithCopiedBuffer(stack_buffer, 42);
ASSERT_TRUE(binary.get());
ASSERT_TRUE(binary->GetBuffer());
ASSERT_NE(stack_buffer, binary->GetBuffer());
@@ -468,7 +468,7 @@
// Test overloaded GetAsBinary.
Value* narrow_value = binary.get();
- const BinaryValue* narrow_binary = NULL;
+ const Value* narrow_binary = NULL;
ASSERT_TRUE(narrow_value->GetAsBinary(&narrow_binary));
EXPECT_EQ(binary.get(), narrow_binary);
}
@@ -674,9 +674,8 @@
original_dict.Set("string16", std::move(scoped_string16));
std::vector<char> original_buffer(42, '!');
- std::unique_ptr<BinaryValue> scoped_binary(
- new BinaryValue(std::move(original_buffer)));
- BinaryValue* original_binary = scoped_binary.get();
+ std::unique_ptr<Value> scoped_binary(new Value(std::move(original_buffer)));
+ Value* original_binary = scoped_binary.get();
original_dict.Set("binary", std::move(scoped_binary));
std::unique_ptr<ListValue> scoped_list(new ListValue());
@@ -1008,8 +1007,7 @@
original_dict.Set("string16", std::move(scoped_string16));
std::vector<char> original_buffer(42, '!');
- std::unique_ptr<BinaryValue> scoped_binary(
- new BinaryValue(std::move(original_buffer)));
+ std::unique_ptr<Value> scoped_binary(new Value(std::move(original_buffer)));
Value* original_binary = scoped_binary.get();
original_dict.Set("binary", std::move(scoped_binary));
@@ -1244,7 +1242,7 @@
Value int_value(1234);
Value double_value(12.34567);
Value string_value("foo");
- BinaryValue binary_value(Value::Type::BINARY);
+ Value binary_value(Value::Type::BINARY);
DictionaryValue dict_value;
ListValue list_value;
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index 9ef571f..c17c8be 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -297,8 +297,8 @@
int length;
if (!iter->ReadData(&data, &length))
return false;
- std::unique_ptr<base::BinaryValue> val =
- base::BinaryValue::CreateWithCopiedBuffer(data, length);
+ std::unique_ptr<base::Value> val =
+ base::Value::CreateWithCopiedBuffer(data, length);
*value = val.release();
break;
}
diff --git a/mojo/common/common_custom_types_unittest.cc b/mojo/common/common_custom_types_unittest.cc
index 36fc042..b094378 100644
--- a/mojo/common/common_custom_types_unittest.cc
+++ b/mojo/common/common_custom_types_unittest.cc
@@ -294,7 +294,7 @@
ASSERT_TRUE(ptr->BounceValue(input->CreateDeepCopy(), &output));
EXPECT_TRUE(base::Value::Equals(input.get(), output.get()));
- input = base::BinaryValue::CreateWithCopiedBuffer("mojo", 4);
+ input = base::Value::CreateWithCopiedBuffer("mojo", 4);
ASSERT_TRUE(ptr->BounceValue(input->CreateDeepCopy(), &output));
EXPECT_TRUE(base::Value::Equals(input.get(), output.get()));
@@ -304,8 +304,7 @@
dict->SetString("string", "some string");
dict->SetBoolean("nested.bool", true);
dict->SetInteger("nested.int", 9);
- dict->Set("some_binary",
- base::BinaryValue::CreateWithCopiedBuffer("mojo", 4));
+ dict->Set("some_binary", base::Value::CreateWithCopiedBuffer("mojo", 4));
dict->Set("null_value", base::MakeUnique<base::Value>());
dict->SetIntegerWithoutPathExpansion("non_nested.int", 10);
{
@@ -327,7 +326,7 @@
list->AppendString("string");
list->AppendDouble(42.1);
list->AppendBoolean(true);
- list->Append(base::BinaryValue::CreateWithCopiedBuffer("mojo", 4));
+ list->Append(base::Value::CreateWithCopiedBuffer("mojo", 4));
list->Append(base::MakeUnique<base::Value>());
{
std::unique_ptr<base::DictionaryValue> list_dict(
diff --git a/mojo/common/values_struct_traits.cc b/mojo/common/values_struct_traits.cc
index ef88a09..6d392ec 100644
--- a/mojo/common/values_struct_traits.cc
+++ b/mojo/common/values_struct_traits.cc
@@ -83,7 +83,7 @@
case common::mojom::ValueDataView::Tag::BINARY_VALUE: {
mojo::ArrayDataView<uint8_t> binary_data;
data.GetBinaryValueDataView(&binary_data);
- *value_out = base::BinaryValue::CreateWithCopiedBuffer(
+ *value_out = base::Value::CreateWithCopiedBuffer(
reinterpret_cast<const char*>(binary_data.data()),
binary_data.size());
return true;
diff --git a/mojo/common/values_struct_traits.h b/mojo/common/values_struct_traits.h
index befcf3a..4139ce6 100644
--- a/mojo/common/values_struct_traits.h
+++ b/mojo/common/values_struct_traits.h
@@ -173,7 +173,7 @@
}
static mojo::ConstCArray<uint8_t> binary_value(const base::Value& value) {
- const base::BinaryValue* binary_value = nullptr;
+ const base::Value* binary_value = nullptr;
if (!value.GetAsBinary(&binary_value))
NOTREACHED();
return mojo::ConstCArray<uint8_t>(