Index: content/child/v8_value_converter_impl.cc |
diff --git a/content/child/v8_value_converter_impl.cc b/content/child/v8_value_converter_impl.cc |
index 89378a8cb9dcfd1396f11f938e61ab7bd9c76d4d..5dcf63608cd31a9360fda74eb54bed1c2f0cb166 100644 |
--- a/content/child/v8_value_converter_impl.cc |
+++ b/content/child/v8_value_converter_impl.cc |
@@ -232,45 +232,45 @@ v8::Local<v8::Value> V8ValueConverterImpl::ToV8ValueImpl( |
const base::Value* value) const { |
CHECK(value); |
switch (value->GetType()) { |
- case base::Value::TYPE_NULL: |
+ case base::Value::Type::NONE: |
return v8::Null(isolate); |
- case base::Value::TYPE_BOOLEAN: { |
+ case base::Value::Type::BOOLEAN: { |
bool val = false; |
CHECK(value->GetAsBoolean(&val)); |
return v8::Boolean::New(isolate, val); |
} |
- case base::Value::TYPE_INTEGER: { |
+ case base::Value::Type::INTEGER: { |
int val = 0; |
CHECK(value->GetAsInteger(&val)); |
return v8::Integer::New(isolate, val); |
} |
- case base::Value::TYPE_DOUBLE: { |
+ case base::Value::Type::DOUBLE: { |
double val = 0.0; |
CHECK(value->GetAsDouble(&val)); |
return v8::Number::New(isolate, val); |
} |
- case base::Value::TYPE_STRING: { |
+ case base::Value::Type::STRING: { |
std::string val; |
CHECK(value->GetAsString(&val)); |
return v8::String::NewFromUtf8( |
isolate, val.c_str(), v8::String::kNormalString, val.length()); |
} |
- case base::Value::TYPE_LIST: |
+ case base::Value::Type::LIST: |
return ToV8Array(isolate, |
creation_context, |
static_cast<const base::ListValue*>(value)); |
- case base::Value::TYPE_DICTIONARY: |
+ case base::Value::Type::DICTIONARY: |
return ToV8Object(isolate, |
creation_context, |
static_cast<const base::DictionaryValue*>(value)); |
- case base::Value::TYPE_BINARY: |
+ case base::Value::Type::BINARY: |
return ToArrayBuffer(isolate, |
creation_context, |
static_cast<const base::BinaryValue*>(value)); |
@@ -615,7 +615,7 @@ std::unique_ptr<base::Value> V8ValueConverterImpl::FromV8Object( |
// there *is* a "windowId" property, but since it should be an int, code |
// on the browser which doesn't additionally check for null will fail. |
// We can avoid all bugs related to this by stripping null. |
- if (strip_null_from_objects_ && child->IsType(base::Value::TYPE_NULL)) |
+ if (strip_null_from_objects_ && child->IsType(base::Value::Type::NONE)) |
continue; |
result->SetWithoutPathExpansion(std::string(*name_utf8, name_utf8.length()), |