Update to Chromium //base at Chromium commit 82baa9afc6620c68cb2168f20bb65e77e3e57f0a.

trace_event/memory_allocator_dump_unittest.cc

Index: trace_event/memory_allocator_dump_unittest.cc
diff --git a/trace_event/memory_allocator_dump_unittest.cc b/trace_event/memory_allocator_dump_unittest.cc
index 8a41513af6ad8501baa97d13582deffe09067630..f787e64f0671e5e6546a660409de3df64a437da0 100644
--- a/trace_event/memory_allocator_dump_unittest.cc
+++ b/trace_event/memory_allocator_dump_unittest.cc
@@ -28,7 +28,7 @@ class FakeMemoryAllocatorDumpProvider : public MemoryDumpProvider {
 
     root_heap->AddScalar(MemoryAllocatorDump::kNameSize,
                          MemoryAllocatorDump::kUnitsBytes, 4096);
-    root_heap->AddScalar(MemoryAllocatorDump::kNameObjectsCount,
+    root_heap->AddScalar(MemoryAllocatorDump::kNameObjectCount,
                          MemoryAllocatorDump::kUnitsObjects, 42);
     root_heap->AddScalar("attr1", "units1", 1234);
     root_heap->AddString("attr2", "units2", "string_value");
@@ -38,7 +38,7 @@ class FakeMemoryAllocatorDumpProvider : public MemoryDumpProvider {
         pmd->CreateAllocatorDump("foobar_allocator/sub_heap");
     sub_heap->AddScalar(MemoryAllocatorDump::kNameSize,
                         MemoryAllocatorDump::kUnitsBytes, 1);
-    sub_heap->AddScalar(MemoryAllocatorDump::kNameObjectsCount,
+    sub_heap->AddScalar(MemoryAllocatorDump::kNameObjectCount,
                         MemoryAllocatorDump::kUnitsObjects, 3);
 
     pmd->CreateAllocatorDump("foobar_allocator/sub_heap/empty");
@@ -126,7 +126,7 @@ TEST(MemoryAllocatorDumpTest, GuidGeneration) {
 TEST(MemoryAllocatorDumpTest, DumpIntoProcessMemoryDump) {
   FakeMemoryAllocatorDumpProvider fmadp;
   ProcessMemoryDump pmd(make_scoped_refptr(new MemoryDumpSessionState()));
-  MemoryDumpArgs dump_args = {MemoryDumpArgs::LevelOfDetail::HIGH};
+  MemoryDumpArgs dump_args = {MemoryDumpLevelOfDetail::DETAILED};
 
   fmadp.OnMemoryDump(dump_args, &pmd);
 
@@ -138,7 +138,7 @@ TEST(MemoryAllocatorDumpTest, DumpIntoProcessMemoryDump) {
   EXPECT_EQ("foobar_allocator", root_heap->absolute_name());
   CheckScalar(root_heap, MemoryAllocatorDump::kNameSize,
               MemoryAllocatorDump::kUnitsBytes, 4096);
-  CheckScalar(root_heap, MemoryAllocatorDump::kNameObjectsCount,
+  CheckScalar(root_heap, MemoryAllocatorDump::kNameObjectCount,
               MemoryAllocatorDump::kUnitsObjects, 42);
   CheckScalar(root_heap, "attr1", "units1", 1234);
   CheckString(root_heap, "attr2", MemoryAllocatorDump::kTypeString, "units2",
@@ -151,7 +151,7 @@ TEST(MemoryAllocatorDumpTest, DumpIntoProcessMemoryDump) {
   EXPECT_EQ("foobar_allocator/sub_heap", sub_heap->absolute_name());
   CheckScalar(sub_heap, MemoryAllocatorDump::kNameSize,
               MemoryAllocatorDump::kUnitsBytes, 1);
-  CheckScalar(sub_heap, MemoryAllocatorDump::kNameObjectsCount,
+  CheckScalar(sub_heap, MemoryAllocatorDump::kNameObjectCount,
               MemoryAllocatorDump::kUnitsObjects, 3);
   const MemoryAllocatorDump* empty_sub_heap =
       pmd.GetAllocatorDump("foobar_allocator/sub_heap/empty");
@@ -161,7 +161,7 @@ TEST(MemoryAllocatorDumpTest, DumpIntoProcessMemoryDump) {
   DictionaryValue* attrs = nullptr;
   ASSERT_TRUE(raw_attrs->GetAsDictionary(&attrs));
   ASSERT_FALSE(attrs->HasKey(MemoryAllocatorDump::kNameSize));
-  ASSERT_FALSE(attrs->HasKey(MemoryAllocatorDump::kNameObjectsCount));
+  ASSERT_FALSE(attrs->HasKey(MemoryAllocatorDump::kNameObjectCount));
 
   // Check that the AsValueInfo doesn't hit any DCHECK.
   scoped_refptr<TracedValue> traced_value(new TracedValue());