Minor fixes to Mojo MemoryDumpProvider.

mojo/edk/system/handle_table.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_HANDLE_TABLE_H_
 #define MOJO_EDK_SYSTEM_HANDLE_TABLE_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/containers/hash_tables.h"
+#include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "base/trace_event/memory_dump_provider.h"
 #include "mojo/edk/system/dispatcher.h"
+#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
 
 namespace mojo {
 namespace edk {
 
-class HandleTable : public base::trace_event::MemoryDumpProvider {
+class MOJO_SYSTEM_IMPL_EXPORT HandleTable
+    : public base::trace_event::MemoryDumpProvider {
  public:
   HandleTable();
   ~HandleTable() override;
 
   // HandleTable is thread-hostile. All access should be gated by GetLock().
   base::Lock& GetLock();
 
   MojoHandle AddDispatcher(scoped_refptr<Dispatcher> dispatcher);
 
   // Inserts multiple dispatchers received from message transit, populating
@@ skipping 15 matching lines @@
       std::vector<Dispatcher::DispatcherInTransit>* dispatchers);
 
   void CompleteTransitAndClose(
       const std::vector<Dispatcher::DispatcherInTransit>& dispatchers);
   void CancelTransit(
       const std::vector<Dispatcher::DispatcherInTransit>& dispatchers);
 
   void GetActiveHandlesForTest(std::vector<MojoHandle> *handles);
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(HandleTableTest, OnMemoryDump);
+
   // MemoryDumpProvider implementation.
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
                     base::trace_event::ProcessMemoryDump* pmd) override;
 
   struct Entry {
    Entry();
    explicit Entry(scoped_refptr<Dispatcher> dispatcher);
    Entry(const Entry& other);
    ~Entry();
 
    scoped_refptr<Dispatcher> dispatcher;
    bool busy = false;
   };
 
   using HandleMap = base::hash_map<MojoHandle, Entry>;
 
   HandleMap handles_;
   base::Lock lock_;
 
   uint32_t next_available_handle_ = 1;
 
   DISALLOW_COPY_AND_ASSIGN(HandleTable);
 };
 
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_HANDLE_TABLE_H_