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

ios/web/web_state/ui/web_view_js_utils_unittest.mm

 // 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.
 
 #import "ios/web/web_state/ui/web_view_js_utils.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace web {
 
 // Tests that ValueResultFromWKResult converts nil value to nullptr.
 TEST(WebViewJsUtilsTest, ValueResultFromUndefinedWKResult) {
   EXPECT_FALSE(ValueResultFromWKResult(nil));
 }
 
-// Tests that ValueResultFromWKResult converts string to Value::TYPE_STRING.
+// Tests that ValueResultFromWKResult converts string to Value::Type::STRING.
 TEST(WebViewJsUtilsTest, ValueResultFromStringWKResult) {
   std::unique_ptr<base::Value> value(web::ValueResultFromWKResult(@"test"));
   EXPECT_TRUE(value);
-  EXPECT_EQ(base::Value::TYPE_STRING, value->GetType());
+  EXPECT_EQ(base::Value::Type::STRING, value->GetType());
   std::string converted_result;
   value->GetAsString(&converted_result);
   EXPECT_EQ("test", converted_result);
 }
 
-// Tests that ValueResultFromWKResult converts inetger to Value::TYPE_DOUBLE.
+// Tests that ValueResultFromWKResult converts inetger to Value::Type::DOUBLE.
 // NOTE: WKWebView API returns all numbers as kCFNumberFloat64Type, so there is
 // no way to tell if the result is integer or double.
 TEST(WebViewJsUtilsTest, ValueResultFromIntegerWKResult) {
   std::unique_ptr<base::Value> value(web::ValueResultFromWKResult(@1));
   EXPECT_TRUE(value);
-  EXPECT_EQ(base::Value::TYPE_DOUBLE, value->GetType());
+  EXPECT_EQ(base::Value::Type::DOUBLE, value->GetType());
   double converted_result = 0;
   value->GetAsDouble(&converted_result);
   EXPECT_EQ(1, converted_result);
 }
 
-// Tests that ValueResultFromWKResult converts double to Value::TYPE_DOUBLE.
+// Tests that ValueResultFromWKResult converts double to Value::Type::DOUBLE.
 TEST(WebViewJsUtilsTest, ValueResultFromDoubleWKResult) {
   std::unique_ptr<base::Value> value(web::ValueResultFromWKResult(@3.14));
   EXPECT_TRUE(value);
-  EXPECT_EQ(base::Value::TYPE_DOUBLE, value->GetType());
+  EXPECT_EQ(base::Value::Type::DOUBLE, value->GetType());
   double converted_result = 0;
   value->GetAsDouble(&converted_result);
   EXPECT_EQ(3.14, converted_result);
 }
 
-// Tests that ValueResultFromWKResult converts bool to Value::TYPE_BOOLEAN.
+// Tests that ValueResultFromWKResult converts bool to Value::Type::BOOLEAN.
 TEST(WebViewJsUtilsTest, ValueResultFromBoolWKResult) {
   std::unique_ptr<base::Value> value(web::ValueResultFromWKResult(@YES));
   EXPECT_TRUE(value);
-  EXPECT_EQ(base::Value::TYPE_BOOLEAN, value->GetType());
+  EXPECT_EQ(base::Value::Type::BOOLEAN, value->GetType());
   bool converted_result = false;
   value->GetAsBoolean(&converted_result);
   EXPECT_TRUE(converted_result);
 }
 
-// Tests that ValueResultFromWKResult converts null to Value::TYPE_NULL.
+// Tests that ValueResultFromWKResult converts null to Value::Type::NONE.
 TEST(WebViewJsUtilsTest, ValueResultFromNullWKResult) {
   std::unique_ptr<base::Value> value(
       web::ValueResultFromWKResult([NSNull null]));
   EXPECT_TRUE(value);
-  EXPECT_EQ(base::Value::TYPE_NULL, value->GetType());
+  EXPECT_EQ(base::Value::Type::NONE, value->GetType());
 }
 
 // Tests that ValueResultFromWKResult converts NSDictionaries to properly
 // initialized base::DictionaryValue.
 TEST(WebViewJsUtilsTest, ValueResultFromDictionaryWKResult) {
   NSDictionary* test_dictionary =
       @{ @"Key1" : @"Value1",
          @"Key2" : @{@"Key3" : @42} };
 
   std::unique_ptr<base::Value> value(
@@ skipping 105 matching lines @@
        current_depth++) {
     EXPECT_NE(nullptr, current_list);
     inner_list = nullptr;
     current_list->GetList(0, &inner_list);
     current_list = inner_list;
   }
   EXPECT_EQ(nullptr, current_list);
 }
 
 }  // namespace web