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

chrome/browser/prefs/chrome_command_line_pref_store_unittest.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 <gtest/gtest.h>
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 19 matching lines @@
   explicit TestCommandLinePrefStore(base::CommandLine* cl)
       : ChromeCommandLinePrefStore(cl) {}
 
   bool ProxySwitchesAreValid() {
     return ValidateProxySwitches();
   }
 
   void VerifyProxyMode(ProxyPrefs::ProxyMode expected_mode) {
     const base::Value* value = NULL;
     ASSERT_TRUE(GetValue(proxy_config::prefs::kProxy, &value));
-    ASSERT_EQ(base::Value::TYPE_DICTIONARY, value->GetType());
+    ASSERT_EQ(base::Value::Type::DICTIONARY, value->GetType());
     ProxyConfigDictionary dict(
         static_cast<const base::DictionaryValue*>(value));
     ProxyPrefs::ProxyMode actual_mode;
     ASSERT_TRUE(dict.GetMode(&actual_mode));
     EXPECT_EQ(expected_mode, actual_mode);
   }
 
   void VerifySSLCipherSuites(const char* const* ciphers,
                              size_t cipher_count) {
     const base::Value* value = NULL;
     ASSERT_TRUE(GetValue(ssl_config::prefs::kCipherSuiteBlacklist, &value));
-    ASSERT_EQ(base::Value::TYPE_LIST, value->GetType());
+    ASSERT_EQ(base::Value::Type::LIST, value->GetType());
     const base::ListValue* list_value =
         static_cast<const base::ListValue*>(value);
     ASSERT_EQ(cipher_count, list_value->GetSize());
 
     std::string cipher_string;
     for (base::ListValue::const_iterator it = list_value->begin();
          it != list_value->end(); ++it, ++ciphers) {
       ASSERT_TRUE((*it)->GetAsString(&cipher_string));
       EXPECT_EQ(*ciphers, cipher_string);
     }
@@ skipping 51 matching lines @@
       new TestCommandLinePrefStore(&cl);
 
   const base::Value* actual = NULL;
   EXPECT_FALSE(store->GetValue(unknown_bool, &actual));
   EXPECT_FALSE(store->GetValue(unknown_string, &actual));
 
   store->VerifyProxyMode(ProxyPrefs::MODE_FIXED_SERVERS);
 
   const base::Value* value = NULL;
   ASSERT_TRUE(store->GetValue(proxy_config::prefs::kProxy, &value));
-  ASSERT_EQ(base::Value::TYPE_DICTIONARY, value->GetType());
+  ASSERT_EQ(base::Value::Type::DICTIONARY, value->GetType());
   ProxyConfigDictionary dict(static_cast<const base::DictionaryValue*>(value));
 
   std::string string_result;
 
   ASSERT_TRUE(dict.GetProxyServer(&string_result));
   EXPECT_EQ("proxy", string_result);
 
   ASSERT_TRUE(dict.GetBypassList(&string_result));
   EXPECT_EQ("list", string_result);
 }
@@ skipping 81 matching lines @@
   cl3.AppendSwitchASCII(switches::kCipherSuiteBlacklist,
                         "0x0004;MOAR;0x0005");
   scoped_refptr<TestCommandLinePrefStore> store3 =
       new TestCommandLinePrefStore(&cl3);
   const char* const expected_ciphers3[] = {
     "0x0004;MOAR;0x0005"
   };
   store3->VerifySSLCipherSuites(expected_ciphers3,
                                 arraysize(expected_ciphers3));
 }