content: Crash key and trace counter cleanup.

content/common/host_discardable_shared_memory_manager.cc

 // Copyright 2014 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 "content/common/host_discardable_shared_memory_manager.h"
 
 #include <algorithm>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
@@ skipping 380 matching lines @@
   // is that the memory will be released to the OS if the child process is
   // no longer referencing it.
   // Note: We intentionally leave the segment in the |segments| vector to
   // avoid reconstructing the heap. The element will be removed from the heap
   // when its last usage time is older than all other segments.
   memory->Close();
 }
 
 void HostDiscardableSharedMemoryManager::BytesAllocatedChanged(
     size_t new_bytes_allocated) const {
-  TRACE_COUNTER_ID1("renderer_host", "TotalDiscardableMemoryUsage", this,
-                    new_bytes_allocated);
+  TRACE_COUNTER1("renderer_host", "TotalDiscardableMemoryUsage",
+                 new_bytes_allocated);
 
-  static const char kTotalDiscardableMemoryUsageKey[] = "total-dm-usage";
-  base::debug::SetCrashKeyValue(kTotalDiscardableMemoryUsageKey,
+  static const char kTotalDiscardableMemoryAllocatedKey[] =
+      "total-discardable-memory-allocated";
+  base::debug::SetCrashKeyValue(kTotalDiscardableMemoryAllocatedKey,
                                 base::Uint64ToString(new_bytes_allocated));
 }
 
 base::Time HostDiscardableSharedMemoryManager::Now() const {
   return base::Time::Now();
 }
 
 void HostDiscardableSharedMemoryManager::ScheduleEnforceMemoryPolicy() {
   lock_.AssertAcquired();
 
   if (enforce_memory_policy_pending_)
     return;
 
   enforce_memory_policy_pending_ = true;
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&HostDiscardableSharedMemoryManager::EnforceMemoryPolicy,
                  weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kEnforceMemoryPolicyDelayMs));
 }
 
 }  // namespace content