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

chromeos/network/onc/onc_merger.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 "chromeos/network/onc/onc_merger.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 96 matching lines @@
       if (!*it_outer)
         continue;
 
       for (base::DictionaryValue::Iterator field(**it_outer); !field.IsAtEnd();
            field.Advance()) {
         const std::string& key = field.key();
         if (key == ::onc::kRecommended || !visited.insert(key).second)
           continue;
 
         std::unique_ptr<base::Value> merged_value;
-        if (field.value().IsType(base::Value::TYPE_DICTIONARY)) {
+        if (field.value().IsType(base::Value::Type::DICTIONARY)) {
           DictPtrs nested_dicts;
           for (DictPtrs::const_iterator it_inner = dicts.begin();
                it_inner != dicts.end(); ++it_inner) {
             const base::DictionaryValue* nested_dict = NULL;
             if (*it_inner)
               (*it_inner)->GetDictionaryWithoutPathExpansion(key, &nested_dict);
             nested_dicts.push_back(nested_dict);
           }
           DictionaryPtr merged_dict(MergeNestedDictionaries(key, nested_dicts));
           if (!merged_dict->empty())
@@ skipping 378 matching lines @@
     const base::DictionaryValue* shared_settings,
     const base::DictionaryValue* active_settings) {
   MergeToAugmented merger;
   return merger.MergeDictionaries(
       signature, user_policy, device_policy, user_settings, shared_settings,
       active_settings);
 }
 
 }  // namespace onc
 }  // namespace chromeos