Cleanup: Remove deprecated base::Value methods from contents. Use base::Value too.

content/renderer/v8_value_converter_impl.cc

 // Copyright (c) 2012 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 "content/renderer/v8_value_converter_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebArrayBuffer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebArrayBufferView.h"
 #include "v8/include/v8.h"
 
-using base::BinaryValue;
-using base::DictionaryValue;
-using base::ListValue;
-using base::StringValue;
-using base::Value;
-
 namespace content {
 
 V8ValueConverter* V8ValueConverter::create() {
   return new V8ValueConverterImpl();
 }
 
 V8ValueConverterImpl::V8ValueConverterImpl()
     : date_allowed_(false),
       reg_exp_allowed_(false),
       function_allowed_(false),
@@ skipping 10 matching lines @@
 
 void V8ValueConverterImpl::SetFunctionAllowed(bool val) {
   function_allowed_ = val;
 }
 
 void V8ValueConverterImpl::SetStripNullFromObjects(bool val) {
   strip_null_from_objects_ = val;
 }
 
 v8::Handle<v8::Value> V8ValueConverterImpl::ToV8Value(
-    const Value* value, v8::Handle<v8::Context> context) const {
+    const base::Value* value, v8::Handle<v8::Context> context) const {
   v8::Context::Scope context_scope(context);
   v8::HandleScope handle_scope;
   return handle_scope.Close(ToV8ValueImpl(value));
 }
 
 Value* V8ValueConverterImpl::FromV8Value(
     v8::Handle<v8::Value> val,
     v8::Handle<v8::Context> context) const {
   v8::Context::Scope context_scope(context);
   v8::HandleScope handle_scope;
   std::set<int> unique_set;
   return FromV8ValueImpl(val, &unique_set);
 }
 
 v8::Handle<v8::Value> V8ValueConverterImpl::ToV8ValueImpl(
-     const Value* value) const {
+     const base::Value* value) const {
   CHECK(value);
   switch (value->GetType()) {
-    case Value::TYPE_NULL:
+    case base::Value::TYPE_NULL:
       return v8::Null();
 
-    case Value::TYPE_BOOLEAN: {
+    case base::Value::TYPE_BOOLEAN: {
       bool val = false;
       CHECK(value->GetAsBoolean(&val));
       return v8::Boolean::New(val);
     }
 
-    case Value::TYPE_INTEGER: {
+    case base::Value::TYPE_INTEGER: {
       int val = 0;
       CHECK(value->GetAsInteger(&val));
       return v8::Integer::New(val);
     }
 
-    case Value::TYPE_DOUBLE: {
+    case base::Value::TYPE_DOUBLE: {
       double val = 0.0;
       CHECK(value->GetAsDouble(&val));
       return v8::Number::New(val);
     }
 
-    case Value::TYPE_STRING: {
+    case base::Value::TYPE_STRING: {
       std::string val;
       CHECK(value->GetAsString(&val));
       return v8::String::New(val.c_str(), val.length());
     }
 
-    case Value::TYPE_LIST:
-      return ToV8Array(static_cast<const ListValue*>(value));
+    case base::Value::TYPE_LIST:
+      return ToV8Array(static_cast<const base::ListValue*>(value));
 
-    case Value::TYPE_DICTIONARY:
-      return ToV8Object(static_cast<const DictionaryValue*>(value));
+    case base::Value::TYPE_DICTIONARY:
+      return ToV8Object(static_cast<const base::DictionaryValue*>(value));
 
-    case Value::TYPE_BINARY:
-      return ToArrayBuffer(static_cast<const BinaryValue*>(value));
+    case base::Value::TYPE_BINARY:
+      return ToArrayBuffer(static_cast<const base::BinaryValue*>(value));
 
     default:
       LOG(ERROR) << "Unexpected value type: " << value->GetType();
       return v8::Null();
   }
 }
 
 v8::Handle<v8::Value> V8ValueConverterImpl::ToV8Array(
-    const ListValue* val) const {
+    const base::ListValue* val) const {
   v8::Handle<v8::Array> result(v8::Array::New(val->GetSize()));
 
   for (size_t i = 0; i < val->GetSize(); ++i) {
-    const Value* child = NULL;
+    const base::Value* child = NULL;
     CHECK(val->Get(i, &child));
 
     v8::Handle<v8::Value> child_v8 = ToV8ValueImpl(child);
     CHECK(!child_v8.IsEmpty());
 
     v8::TryCatch try_catch;
     result->Set(static_cast<uint32>(i), child_v8);
     if (try_catch.HasCaught())
       LOG(ERROR) << "Setter for index " << i << " threw an exception.";
   }
 
   return result;
 }
 
 v8::Handle<v8::Value> V8ValueConverterImpl::ToV8Object(
-    const DictionaryValue* val) const {
+    const base::DictionaryValue* val) const {
   v8::Handle<v8::Object> result(v8::Object::New());
 
-  for (DictionaryValue::Iterator iter(*val); !iter.IsAtEnd(); iter.Advance()) {
+  for (base::DictionaryValue::Iterator iter(*val);
+       !iter.IsAtEnd(); iter.Advance()) {
     const std::string& key = iter.key();
     v8::Handle<v8::Value> child_v8 = ToV8ValueImpl(&iter.value());
     CHECK(!child_v8.IsEmpty());
 
     v8::TryCatch try_catch;
     result->Set(v8::String::New(key.c_str(), key.length()), child_v8);
     if (try_catch.HasCaught()) {
       LOG(ERROR) << "Setter for property " << key.c_str() << " threw an "
                  << "exception.";
     }
   }
 
   return result;
 }
 
 v8::Handle<v8::Value> V8ValueConverterImpl::ToArrayBuffer(
-    const BinaryValue* value) const {
+    const base::BinaryValue* value) const {
   WebKit::WebArrayBuffer buffer =
       WebKit::WebArrayBuffer::create(value->GetSize(), 1);
   memcpy(buffer.data(), value->GetBuffer(), value->GetSize());
   return buffer.toV8Value();
 }
 
 Value* V8ValueConverterImpl::FromV8ValueImpl(v8::Handle<v8::Value> val,
     std::set<int>* unique_set) const {
   CHECK(!val.IsEmpty());
 
   if (val->IsNull())
-    return Value::CreateNullValue();
+    return base::Value::CreateNullValue();
 
   if (val->IsBoolean())
-    return Value::CreateBooleanValue(val->ToBoolean()->Value());
+    return new base::FundamentalValue(val->ToBoolean()->Value());
 
   if (val->IsInt32())
-    return Value::CreateIntegerValue(val->ToInt32()->Value());
+    return new base::FundamentalValue(val->ToInt32()->Value());
 
   if (val->IsNumber())
-    return Value::CreateDoubleValue(val->ToNumber()->Value());
+    return new base::FundamentalValue(val->ToNumber()->Value());
 
   if (val->IsString()) {
     v8::String::Utf8Value utf8(val->ToString());
-    return Value::CreateStringValue(std::string(*utf8, utf8.length()));
+    return new base::StringValue(std::string(*utf8, utf8.length()));
   }
 
   if (val->IsUndefined())
     // JSON.stringify ignores undefined.
     return NULL;
 
   if (val->IsDate()) {
     if (!date_allowed_)
       // JSON.stringify would convert this to a string, but an object is more
       // consistent within this class.
       return FromV8Object(val->ToObject(), unique_set);
     v8::Date* date = v8::Date::Cast(*val);
-    return Value::CreateDoubleValue(date->NumberValue() / 1000.0);
+    return new base::FundamentalValue(date->NumberValue() / 1000.0);
   }
 
   if (val->IsRegExp()) {
     if (!reg_exp_allowed_)
       // JSON.stringify converts to an object.
       return FromV8Object(val->ToObject(), unique_set);
-    return Value::CreateStringValue(*v8::String::Utf8Value(val->ToString()));
+    return new base::StringValue(*v8::String::Utf8Value(val->ToString()));
   }
 
   // v8::Value doesn't have a ToArray() method for some reason.
   if (val->IsArray())
     return FromV8Array(val.As<v8::Array>(), unique_set);
 
   if (val->IsFunction()) {
     if (!function_allowed_)
       // JSON.stringify refuses to convert function(){}.
       return NULL;
     return FromV8Object(val->ToObject(), unique_set);
   }
 
   if (val->IsObject()) {
-    BinaryValue* binary_value = FromV8Buffer(val);
+    base::BinaryValue* binary_value = FromV8Buffer(val);
     if (binary_value) {
       return binary_value;
     } else {
       return FromV8Object(val->ToObject(), unique_set);
     }
   }
 
   LOG(ERROR) << "Unexpected v8 value type encountered.";
   return NULL;
 }
 
 Value* V8ValueConverterImpl::FromV8Array(v8::Handle<v8::Array> val,
     std::set<int>* unique_set) const {
   if (unique_set && unique_set->count(val->GetIdentityHash()))
-    return Value::CreateNullValue();
+    return base::Value::CreateNullValue();
 
   scoped_ptr<v8::Context::Scope> scope;
   // If val was created in a different context than our current one, change to
   // that context, but change back after val is converted.
   if (!val->CreationContext().IsEmpty() &&
       val->CreationContext() != v8::Context::GetCurrent())
     scope.reset(new v8::Context::Scope(val->CreationContext()));
 
-  ListValue* result = new ListValue();
+  base::ListValue* result = new base::ListValue();
 
   if (unique_set)
     unique_set->insert(val->GetIdentityHash());
   // Only fields with integer keys are carried over to the ListValue.
   for (uint32 i = 0; i < val->Length(); ++i) {
     v8::TryCatch try_catch;
     v8::Handle<v8::Value> child_v8 = val->Get(i);
     if (try_catch.HasCaught()) {
       LOG(ERROR) << "Getter for index " << i << " threw an exception.";
       child_v8 = v8::Null();
     }
 
     if (!val->HasRealIndexedProperty(i))
       continue;
 
-    Value* child = FromV8ValueImpl(child_v8, unique_set);
+    base::Value* child = FromV8ValueImpl(child_v8, unique_set);
     if (child)
       result->Append(child);
     else
       // JSON.stringify puts null in places where values don't serialize, for
       // example undefined and functions. Emulate that behavior.
-      result->Append(Value::CreateNullValue());
+      result->Append(base::Value::CreateNullValue());
   }
   return result;
 }
 
 base::BinaryValue* V8ValueConverterImpl::FromV8Buffer(
     v8::Handle<v8::Value> val) const {
   char* data = NULL;
   size_t length = 0;
 
   scoped_ptr<WebKit::WebArrayBuffer> array_buffer(
@@ skipping 13 matching lines @@
   if (data)
     return base::BinaryValue::CreateWithCopiedBuffer(data, length);
   else
     return NULL;
 }
 
 Value* V8ValueConverterImpl::FromV8Object(
     v8::Handle<v8::Object> val,
     std::set<int>* unique_set) const {
   if (unique_set && unique_set->count(val->GetIdentityHash()))
-    return Value::CreateNullValue();
+    return base::Value::CreateNullValue();
   scoped_ptr<v8::Context::Scope> scope;
   // If val was created in a different context than our current one, change to
   // that context, but change back after val is converted.
   if (!val->CreationContext().IsEmpty() &&
       val->CreationContext() != v8::Context::GetCurrent())
     scope.reset(new v8::Context::Scope(val->CreationContext()));
 
-  scoped_ptr<DictionaryValue> result(new DictionaryValue());
+  scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
   v8::Handle<v8::Array> property_names(val->GetOwnPropertyNames());
 
   if (unique_set)
     unique_set->insert(val->GetIdentityHash());
 
   for (uint32 i = 0; i < property_names->Length(); ++i) {
     v8::Handle<v8::Value> key(property_names->Get(i));
 
     // Extend this test to cover more types as necessary and if sensible.
     if (!key->IsString() &&
@@ skipping 11 matching lines @@
 
     v8::TryCatch try_catch;
     v8::Handle<v8::Value> child_v8 = val->Get(key);
 
     if (try_catch.HasCaught()) {
       LOG(ERROR) << "Getter for property " << *name_utf8
                  << " threw an exception.";
       child_v8 = v8::Null();
     }
 
-    scoped_ptr<Value> child(FromV8ValueImpl(child_v8, unique_set));
+    scoped_ptr<base::Value> child(FromV8ValueImpl(child_v8, unique_set));
     if (!child.get())
       // JSON.stringify skips properties whose values don't serialize, for
       // example undefined and functions. Emulate that behavior.
       continue;
 
     // Strip null if asked (and since undefined is turned into null, undefined
     // too). The use case for supporting this is JSON-schema support,
     // specifically for extensions, where "optional" JSON properties may be
     // represented as null, yet due to buggy legacy code elsewhere isn't
     // treated as such (potentially causing crashes). For example, the
@@ skipping 16 matching lines @@
       continue;
 
     result->SetWithoutPathExpansion(std::string(*name_utf8, name_utf8.length()),
                                     child.release());
   }
 
   return result.release();
 }
 
 }  // namespace content