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

content/browser/android/java/gin_java_method_invocation_helper.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_method_invocation_helper.h"
 
 #include <unistd.h>
 #include <cmath>
 #include <utility>
 
@@ skipping 34 matching lines @@
   // |arguments_|.  Then we can use this map on the background thread without
   // accessing |dispatcher|.
   BuildObjectRefsFromListValue(dispatcher, *arguments_);
 }
 
 // As V8ValueConverter has finite recursion depth when serializing
 // JavaScript values, we don't bother about having a recursion threshold here.
 void GinJavaMethodInvocationHelper::BuildObjectRefsFromListValue(
     DispatcherDelegate* dispatcher,
     const base::Value& list_value) {
-  DCHECK(list_value.IsType(base::Value::TYPE_LIST));
+  DCHECK(list_value.IsType(base::Value::Type::LIST));
   const base::ListValue* list;
   list_value.GetAsList(&list);
   for (const auto& entry : *list) {
     if (AppendObjectRef(dispatcher, *entry))
       continue;
-    if (entry->IsType(base::Value::TYPE_LIST)) {
+    if (entry->IsType(base::Value::Type::LIST)) {
       BuildObjectRefsFromListValue(dispatcher, *entry);
-    } else if (entry->IsType(base::Value::TYPE_DICTIONARY)) {
+    } else if (entry->IsType(base::Value::Type::DICTIONARY)) {
       BuildObjectRefsFromDictionaryValue(dispatcher, *entry);
     }
   }
 }
 
 void GinJavaMethodInvocationHelper::BuildObjectRefsFromDictionaryValue(
     DispatcherDelegate* dispatcher,
     const base::Value& dict_value) {
-  DCHECK(dict_value.IsType(base::Value::TYPE_DICTIONARY));
+  DCHECK(dict_value.IsType(base::Value::Type::DICTIONARY));
   const base::DictionaryValue* dict;
   dict_value.GetAsDictionary(&dict);
   for (base::DictionaryValue::Iterator iter(*dict);
        !iter.IsAtEnd();
        iter.Advance()) {
     if (AppendObjectRef(dispatcher, iter.value()))
       continue;
-    if (iter.value().IsType(base::Value::TYPE_LIST)) {
+    if (iter.value().IsType(base::Value::Type::LIST)) {
       BuildObjectRefsFromListValue(dispatcher, iter.value());
-    } else if (iter.value().IsType(base::Value::TYPE_DICTIONARY)) {
+    } else if (iter.value().IsType(base::Value::Type::DICTIONARY)) {
       BuildObjectRefsFromDictionaryValue(dispatcher, iter.value());
     }
   }
 }
 
 bool GinJavaMethodInvocationHelper::AppendObjectRef(
     DispatcherDelegate* dispatcher,
     const base::Value& raw_value) {
   if (!GinJavaBridgeValue::ContainsGinJavaBridgeValue(&raw_value))
     return false;
@@ skipping 241 matching lines @@
   }
   // This is for all cases except JavaType::TypeObject.
   if (!base::android::ClearException(env)) {
     SetPrimitiveResult(result_wrapper);
   } else {
     SetInvocationError(kGinJavaBridgeJavaExceptionRaised);
   }
 }
 
 }  // namespace content