Make base::Value::TYPE a scoped enum.

content/browser/android/java/gin_java_script_to_java_types_coercion.cc

 // Copyright 2014 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/browser/android/java/gin_java_script_to_java_types_coercion.h"
 
 #include <stdint.h>
 #include <unistd.h>
 
 #include <limits>
@@ skipping 497 matching lines @@
   value->GetAsDictionary(&dictionary_value);
   const base::Value* length_value;
   // If the object does not have a length property, return null.
   if (!dictionary_value->Get("length", &length_value)) {
     return NULL;
   }
 
   // If the length property does not have numeric type, or is outside the valid
   // range for a Java array length, return null.
   jsize length = -1;
-  if (length_value->IsType(base::Value::TYPE_INTEGER)) {
+  if (length_value->IsType(base::Value::Type::INTEGER)) {
     int int_length;
     length_value->GetAsInteger(&int_length);
     if (int_length >= 0 && int_length <= std::numeric_limits<int32_t>::max()) {
       length = static_cast<jsize>(int_length);
     }
-  } else if (length_value->IsType(base::Value::TYPE_DOUBLE)) {
+  } else if (length_value->IsType(base::Value::Type::DOUBLE)) {
     double double_length;
     length_value->GetAsDouble(&double_length);
     if (double_length >= 0.0 &&
         double_length <= std::numeric_limits<int32_t>::max()) {
       length = static_cast<jsize>(double_length);
     }
   }
   if (length == -1) {
     return NULL;
   }
@@ skipping 87 matching lines @@
       jvalue null_value = {0};
       result = null_value;
       break;
     }
     case JavaType::TypeBoolean:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to false. Spec
       // requires raising a JavaScript exception.
       result.z = JNI_FALSE;
       break;
     case JavaType::TypeArray:
-      if (value->IsType(base::Value::TYPE_DICTIONARY)) {
+      if (value->IsType(base::Value::Type::DICTIONARY)) {
         result.l = CoerceJavaScriptDictionaryToArray(
             env, value, target_type, object_refs, error);
-      } else if (value->IsType(base::Value::TYPE_LIST)) {
+      } else if (value->IsType(base::Value::Type::LIST)) {
         result.l = CoerceJavaScriptListToArray(
             env, value, target_type, object_refs, error);
       } else {
         result.l = NULL;
       }
       break;
     case JavaType::TypeVoid:
       // Conversion to void must never happen.
       NOTREACHED();
       break;
@@ skipping 45 matching lines @@
 jvalue CoerceJavaScriptValueToJavaValue(JNIEnv* env,
                                         const base::Value* value,
                                         const JavaType& target_type,
                                         bool coerce_to_string,
                                         const ObjectRefs& object_refs,
                                         GinJavaBridgeError* error) {
   // Note that in all these conversions, the relevant field of the jvalue must
   // always be explicitly set, as jvalue does not initialize its fields.
 
   switch (value->GetType()) {
-    case base::Value::TYPE_INTEGER:
+    case base::Value::Type::INTEGER:
       return CoerceJavaScriptIntegerToJavaValue(
           env, value, target_type, coerce_to_string, error);
-    case base::Value::TYPE_DOUBLE: {
+    case base::Value::Type::DOUBLE: {
       double double_value;
       value->GetAsDouble(&double_value);
       return CoerceJavaScriptDoubleToJavaValue(
           env, double_value, target_type, coerce_to_string, error);
     }
-    case base::Value::TYPE_BOOLEAN:
+    case base::Value::Type::BOOLEAN:
       return CoerceJavaScriptBooleanToJavaValue(
           env, value, target_type, coerce_to_string, error);
-    case base::Value::TYPE_STRING:
+    case base::Value::Type::STRING:
       return CoerceJavaScriptStringToJavaValue(env, value, target_type, error);
-    case base::Value::TYPE_DICTIONARY:
-    case base::Value::TYPE_LIST:
+    case base::Value::Type::DICTIONARY:
+    case base::Value::Type::LIST:
       return CoerceJavaScriptObjectToJavaValue(
           env, value, target_type, coerce_to_string, object_refs, error);
-    case base::Value::TYPE_NULL:
+    case base::Value::Type::NONE:
       return CoerceJavaScriptNullOrUndefinedToJavaValue(
           env, value, target_type, coerce_to_string, error);
-    case base::Value::TYPE_BINARY:
+    case base::Value::Type::BINARY:
       return CoerceGinJavaBridgeValueToJavaValue(
           env, value, target_type, coerce_to_string, object_refs, error);
   }
   NOTREACHED();
   return jvalue();
 }
 
 }  // namespace content