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

content/browser/webrtc/webrtc_internals_browsertest.cc

 // Copyright (c) 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 <stddef.h>
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 221 matching lines @@
       const std::vector<UserMediaRequestEntry>& requests) {
     string json_requests;
     ASSERT_TRUE(
         ExecuteScriptAndExtractString(shell(),
                                       "window.domAutomationController.send("
                                       "    JSON.stringify(userMediaRequests));",
                                       &json_requests));
     std::unique_ptr<base::Value> value_requests =
         base::JSONReader::Read(json_requests);
 
-    EXPECT_EQ(base::Value::TYPE_LIST, value_requests->GetType());
+    EXPECT_EQ(base::Value::Type::LIST, value_requests->GetType());
 
     base::ListValue* list_request =
         static_cast<base::ListValue*>(value_requests.get());
     EXPECT_EQ(requests.size(), list_request->GetSize());
 
     for (size_t i = 0; i < requests.size(); ++i) {
       base::DictionaryValue* dict = NULL;
       ASSERT_TRUE(list_request->GetDictionary(i, &dict));
       int pid, rid;
       std::string origin, audio, video;
@@ skipping 179 matching lines @@
     return count;
   }
 
   // Verifies |dump| contains |peer_connection_number| peer connection dumps,
   // each containing |update_number| updates and |stats_number| stats tables.
   void VerifyPageDumpStructure(base::Value* dump,
                                int peer_connection_number,
                                int update_number,
                                int stats_number) {
     EXPECT_NE((base::Value*)NULL, dump);
-    EXPECT_EQ(base::Value::TYPE_DICTIONARY, dump->GetType());
+    EXPECT_EQ(base::Value::Type::DICTIONARY, dump->GetType());
 
     base::DictionaryValue* dict_dump =
         static_cast<base::DictionaryValue*>(dump);
     EXPECT_EQ((size_t) peer_connection_number, dict_dump->size());
 
     base::DictionaryValue::Iterator it(*dict_dump);
     for (; !it.IsAtEnd(); it.Advance()) {
       base::Value* value = NULL;
       dict_dump->Get(it.key(), &value);
-      EXPECT_EQ(base::Value::TYPE_DICTIONARY, value->GetType());
+      EXPECT_EQ(base::Value::Type::DICTIONARY, value->GetType());
       base::DictionaryValue* pc_dump =
           static_cast<base::DictionaryValue*>(value);
       EXPECT_TRUE(pc_dump->HasKey("updateLog"));
       EXPECT_TRUE(pc_dump->HasKey("stats"));
 
       // Verifies the number of updates.
       pc_dump->Get("updateLog", &value);
-      EXPECT_EQ(base::Value::TYPE_LIST, value->GetType());
+      EXPECT_EQ(base::Value::Type::LIST, value->GetType());
       base::ListValue* list = static_cast<base::ListValue*>(value);
       EXPECT_EQ((size_t) update_number, list->GetSize());
 
       // Verifies the number of stats tables.
       pc_dump->Get("stats", &value);
-      EXPECT_EQ(base::Value::TYPE_DICTIONARY, value->GetType());
+      EXPECT_EQ(base::Value::Type::DICTIONARY, value->GetType());
       base::DictionaryValue* dict = static_cast<base::DictionaryValue*>(value);
       EXPECT_EQ((size_t) stats_number, dict->size());
     }
   }
 
   // Verifies |dump| contains the correct statsTable and statsDataSeries for
   // |pc|.
   void VerifyStatsDump(base::Value* dump,
                        const PeerConnectionEntry& pc,
                        const string& report_type,
                        const string& report_id,
                        const StatsUnit& stats) {
     EXPECT_NE((base::Value*)NULL, dump);
-    EXPECT_EQ(base::Value::TYPE_DICTIONARY, dump->GetType());
+    EXPECT_EQ(base::Value::Type::DICTIONARY, dump->GetType());
 
     base::DictionaryValue* dict_dump =
         static_cast<base::DictionaryValue*>(dump);
     base::Value* value = NULL;
     dict_dump->Get(pc.getIdString(), &value);
     base::DictionaryValue* pc_dump = static_cast<base::DictionaryValue*>(value);
 
     // Verifies there is one data series per stats name.
     value = NULL;
     pc_dump->Get("stats", &value);
-    EXPECT_EQ(base::Value::TYPE_DICTIONARY, value->GetType());
+    EXPECT_EQ(base::Value::Type::DICTIONARY, value->GetType());
 
     base::DictionaryValue* dataSeries =
         static_cast<base::DictionaryValue*>(value);
     EXPECT_EQ(stats.values.size(), dataSeries->size());
   }
 };
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest,
                        AddAndRemovePeerConnection) {
   GURL url("chrome://webrtc-internals");
@@ skipping 372 matching lines @@
   ASSERT_TRUE(ExecuteScriptAndExtractInt(
       shell(),
       "window.domAutomationController.send("
       "   peerConnectionDataStore['" + pc.getIdString() + "']" +
       "       .getDataSeries('" + data_series_id + "').getCount())",
       &count));
   EXPECT_EQ(3, count);
 }
 
 }  // namespace content