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

chromeos/dbus/shill_client_helper.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/dbus/shill_client_helper.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 424 matching lines @@
 
 // Implements AppendValueDataAsVariant. If |dictionary_type| is
 // DICTIONARY_TYPE_VARIANT  and |value| is a Dictionary then it will be written
 // as type 'a{ss}'. Otherwise dictionaries are written as type a{sv}. (This is
 // to support Cellular.APN which expects a string -> string dictionary).
 void AppendValueDataAsVariantInternal(dbus::MessageWriter* writer,
                                       const base::Value& value,
                                       DictionaryType dictionary_type) {
   // Support basic types and string-to-string dictionary.
   switch (value.GetType()) {
-    case base::Value::TYPE_DICTIONARY: {
+    case base::Value::Type::DICTIONARY: {
       const base::DictionaryValue* dictionary = NULL;
       value.GetAsDictionary(&dictionary);
       if (dictionary_type == DICTIONARY_TYPE_STRING) {
         AppendStringDictionary(*dictionary, writer);
       } else {
         dbus::MessageWriter variant_writer(NULL);
         writer->OpenVariant("a{sv}", &variant_writer);
         ShillClientHelper::AppendServicePropertiesDictionary(&variant_writer,
                                                              *dictionary);
         writer->CloseContainer(&variant_writer);
       }
       break;
     }
-    case base::Value::TYPE_LIST: {
+    case base::Value::Type::LIST: {
       const base::ListValue* list = NULL;
       value.GetAsList(&list);
       dbus::MessageWriter variant_writer(NULL);
       writer->OpenVariant("as", &variant_writer);
       dbus::MessageWriter array_writer(NULL);
       variant_writer.OpenArray("s", &array_writer);
       for (base::ListValue::const_iterator it = list->begin();
            it != list->end(); ++it) {
         const base::Value& value = **it;
         std::string value_string;
         if (!value.GetAsString(&value_string))
           NET_LOG(ERROR) << "List value not a string: " << value;
         array_writer.AppendString(value_string);
       }
       variant_writer.CloseContainer(&array_writer);
       writer->CloseContainer(&variant_writer);
       break;
     }
-    case base::Value::TYPE_BOOLEAN:
-    case base::Value::TYPE_INTEGER:
-    case base::Value::TYPE_DOUBLE:
-    case base::Value::TYPE_STRING:
+    case base::Value::Type::BOOLEAN:
+    case base::Value::Type::INTEGER:
+    case base::Value::Type::DOUBLE:
+    case base::Value::Type::STRING:
       dbus::AppendBasicTypeValueDataAsVariant(writer, value);
       break;
     default:
       NET_LOG(ERROR) << "Unexpected value type: " << value.GetType();
   }
 }
 
 }  // namespace
 
 // static
@@ skipping 53 matching lines @@
     return;
   std::unique_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
   if (!value.get())
     return;
 
   for (auto& observer : observer_list_)
     observer.OnPropertyChanged(name, *value);
 }
 
 }  // namespace chromeos