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

chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc

 // Copyright 2013 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 "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
 
 #include <memory>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 67 matching lines @@
   // On Mac, this API is limited to trunk.
   extensions::ScopedCurrentChannel scoped_channel(
       version_info::Channel::UNKNOWN);
 #endif  // OS_MACOSX
 
   std::string manifest(kManifest);
   JSONStringValueDeserializer json(manifest);
   std::string error;
   std::unique_ptr<base::Value> root(json.Deserialize(NULL, &error));
   ASSERT_TRUE(root);
-  ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
+  ASSERT_TRUE(root->IsType(base::Value::Type::DICTIONARY));
   scoped_refptr<Extension> extension = Extension::Create(
       base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
       Manifest::INVALID_LOCATION,
       *static_cast<base::DictionaryValue*>(root.get()),
       Extension::NO_FLAGS,
       &error);
   ASSERT_TRUE(extension.get());
 #if defined(OS_WIN) || defined(OS_MACOSX)
   ASSERT_TRUE(extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
 
@@ skipping 28 matching lines @@
   // On Mac, this API is limited to trunk.
   extensions::ScopedCurrentChannel scoped_channel(
       version_info::Channel::UNKNOWN);
 #endif  // OS_MACOSX
 
   std::string manifest(kPrepopulatedManifest);
   JSONStringValueDeserializer json(manifest);
   std::string error;
   std::unique_ptr<base::Value> root(json.Deserialize(NULL, &error));
   ASSERT_TRUE(root);
-  ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
+  ASSERT_TRUE(root->IsType(base::Value::Type::DICTIONARY));
   scoped_refptr<Extension> extension =
       Extension::Create(base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
                         Manifest::INVALID_LOCATION,
                         *static_cast<base::DictionaryValue*>(root.get()),
                         Extension::NO_FLAGS,
                         &error);
   ASSERT_TRUE(extension.get());
 #if defined(OS_WIN) || defined(OS_MACOSX)
   ASSERT_TRUE(extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
 
@@ skipping 18 matching lines @@
   // On Mac, this API is limited to trunk.
   extensions::ScopedCurrentChannel scoped_channel(
       version_info::Channel::UNKNOWN);
 #endif  // OS_MACOSX
 
   std::string manifest(kBrokenManifest);
   JSONStringValueDeserializer json(manifest);
   std::string error;
   std::unique_ptr<base::Value> root(json.Deserialize(NULL, &error));
   ASSERT_TRUE(root);
-  ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
+  ASSERT_TRUE(root->IsType(base::Value::Type::DICTIONARY));
   scoped_refptr<Extension> extension = Extension::Create(
       base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
       Manifest::INVALID_LOCATION,
       *static_cast<base::DictionaryValue*>(root.get()),
       Extension::NO_FLAGS,
       &error);
 #if defined(OS_WIN) || defined(OS_MACOSX)
   EXPECT_FALSE(extension.get());
   EXPECT_EQ(
       extensions::ErrorUtils::FormatErrorMessage(
           extensions::manifest_errors::kInvalidEmptyDictionary,
           extensions::manifest_keys::kSettingsOverride),
       error);
 #else
   EXPECT_TRUE(extension.get());
   EXPECT_FALSE(
       extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
 #endif
 }
 
 }  // namespace