| Index: base/trace_event/trace_event_unittest.cc
|
| diff --git a/base/trace_event/trace_event_unittest.cc b/base/trace_event/trace_event_unittest.cc
|
| index 81d043ac3945d3582b0a99c22f4adb22d1bd8a21..2fae243fbe2e5aa234264976ff92342e5fcc5f9b 100644
|
| --- a/base/trace_event/trace_event_unittest.cc
|
| +++ b/base/trace_event/trace_event_unittest.cc
|
| @@ -260,7 +260,7 @@ DictionaryValue* TraceEventTestFixture::FindMatchingTraceEntry(
|
| for (size_t i = 0; i < trace_parsed_count; i++) {
|
| Value* value = NULL;
|
| trace_parsed_.Get(i, &value);
|
| - if (!value || value->GetType() != Value::TYPE_DICTIONARY)
|
| + if (!value || value->GetType() != Value::Type::DICTIONARY)
|
| continue;
|
| DictionaryValue* dict = static_cast<DictionaryValue*>(value);
|
|
|
| @@ -278,7 +278,7 @@ void TraceEventTestFixture::DropTracedMetadataRecords() {
|
| for (size_t i = 0; i < old_trace_parsed_size; i++) {
|
| Value* value = nullptr;
|
| old_trace_parsed->Get(i, &value);
|
| - if (!value || value->GetType() != Value::TYPE_DICTIONARY) {
|
| + if (!value || value->GetType() != Value::Type::DICTIONARY) {
|
| trace_parsed_.Append(value->CreateDeepCopy());
|
| continue;
|
| }
|
| @@ -367,7 +367,7 @@ const DictionaryValue* FindTraceEntry(
|
| match_after_this_item = NULL;
|
| continue;
|
| }
|
| - if (!value || value->GetType() != Value::TYPE_DICTIONARY)
|
| + if (!value || value->GetType() != Value::Type::DICTIONARY)
|
| continue;
|
| const DictionaryValue* dict = static_cast<const DictionaryValue*>(value);
|
|
|
| @@ -385,7 +385,7 @@ std::vector<const DictionaryValue*> FindTraceEntries(
|
| for (size_t i = 0; i < trace_parsed_count; i++) {
|
| const Value* value = NULL;
|
| trace_parsed.Get(i, &value);
|
| - if (!value || value->GetType() != Value::TYPE_DICTIONARY)
|
| + if (!value || value->GetType() != Value::Type::DICTIONARY)
|
| continue;
|
| const DictionaryValue* dict = static_cast<const DictionaryValue*>(value);
|
|
|
| @@ -1114,7 +1114,7 @@ void ValidateInstantEventPresentOnEveryThread(const ListValue& trace_parsed,
|
| for (size_t i = 0; i < trace_parsed_count; i++) {
|
| const Value* value = NULL;
|
| trace_parsed.Get(i, &value);
|
| - if (!value || value->GetType() != Value::TYPE_DICTIONARY)
|
| + if (!value || value->GetType() != Value::Type::DICTIONARY)
|
| continue;
|
| const DictionaryValue* dict = static_cast<const DictionaryValue*>(value);
|
| std::string name;
|
| @@ -2320,7 +2320,7 @@ TEST_F(TraceEventTestFixture, PrimitiveArgs) {
|
| dict->GetDictionary("args", &args_dict);
|
| ASSERT_TRUE(args_dict);
|
| EXPECT_TRUE(args_dict->Get("float_one", &value));
|
| - EXPECT_TRUE(value->IsType(Value::TYPE_DOUBLE));
|
| + EXPECT_TRUE(value->IsType(Value::Type::DOUBLE));
|
| EXPECT_TRUE(value->GetAsDouble(&double_value));
|
| EXPECT_EQ(1, double_value);
|
|
|
| @@ -2330,7 +2330,7 @@ TEST_F(TraceEventTestFixture, PrimitiveArgs) {
|
| dict->GetDictionary("args", &args_dict);
|
| ASSERT_TRUE(args_dict);
|
| EXPECT_TRUE(args_dict->Get("float_half", &value));
|
| - EXPECT_TRUE(value->IsType(Value::TYPE_DOUBLE));
|
| + EXPECT_TRUE(value->IsType(Value::Type::DOUBLE));
|
| EXPECT_TRUE(value->GetAsDouble(&double_value));
|
| EXPECT_EQ(0.5, double_value);
|
|
|
| @@ -2340,7 +2340,7 @@ TEST_F(TraceEventTestFixture, PrimitiveArgs) {
|
| dict->GetDictionary("args", &args_dict);
|
| ASSERT_TRUE(args_dict);
|
| EXPECT_TRUE(args_dict->Get("float_neghalf", &value));
|
| - EXPECT_TRUE(value->IsType(Value::TYPE_DOUBLE));
|
| + EXPECT_TRUE(value->IsType(Value::Type::DOUBLE));
|
| EXPECT_TRUE(value->GetAsDouble(&double_value));
|
| EXPECT_EQ(-0.5, double_value);
|
|
|
|
|