Minor fixes to Mojo MemoryDumpProvider.

mojo/edk/system/handle_table.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 "mojo/edk/system/handle_table.h"
 
 #include <stdint.h>
 
 #include <limits>
 
@@ skipping 14 matching lines @@
       return "data_pipe_producer";
     case Dispatcher::Type::DATA_PIPE_CONSUMER:
       return "data_pipe_consumer";
     case Dispatcher::Type::SHARED_BUFFER:
       return "shared_buffer";
     case Dispatcher::Type::WATCHER:
       return "watcher";
     case Dispatcher::Type::PLATFORM_HANDLE:
       return "platform_handle";
   }
+  NOTREACHED();
   return "unknown";
 }
 
-const char* kDumpProviderName = "MojoHandleTable";
-
 }  // namespace
 
 HandleTable::HandleTable() {
-  base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
-      this, kDumpProviderName, nullptr);
 }
 
 HandleTable::~HandleTable() {
-  base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
-      this, kDumpProviderName, nullptr);
 }
 
 base::Lock& HandleTable::GetLock() {
   return lock_;
 }
 
 MojoHandle HandleTable::AddDispatcher(scoped_refptr<Dispatcher> dispatcher) {
   // Oops, we're out of handles.
   if (next_available_handle_ == MOJO_HANDLE_INVALID)
     return MOJO_HANDLE_INVALID;
@@ skipping 114 matching lines @@
   handle_count[Dispatcher::Type::PLATFORM_HANDLE];
 
   // Count the number of each dispatcher type.
   {
     base::AutoLock lock(GetLock());
     for (const auto& entry : handles_) {
       ++handle_count[entry.second.dispatcher->GetType()];
     }
   }
 
   pmd->CreateAllocatorDump("mojo");

[ssid, 2017/06/09 00:38:28]

This line is not required.

   for (const auto& entry : handle_count) {
     base::trace_event::MemoryAllocatorDump* inner_dump =
         pmd->CreateAllocatorDump(std::string("mojo/") +
                                  GetNameForDispatcherType(entry.first));
     inner_dump->AddScalar(
         base::trace_event::MemoryAllocatorDump::kNameObjectCount,
         base::trace_event::MemoryAllocatorDump::kUnitsObjects, entry.second);
   }
 
   return true;
 }
 
 HandleTable::Entry::Entry() {}
 
 HandleTable::Entry::Entry(scoped_refptr<Dispatcher> dispatcher)
     : dispatcher(std::move(dispatcher)) {}
 
 HandleTable::Entry::Entry(const Entry& other) = default;
 
 HandleTable::Entry::~Entry() {}
 
 }  // namespace edk
 }  // namespace mojo