Remove code duplication in CreateWithSharedMemory.

base/metrics/persistent_histogram_allocator.cc

 // Copyright 2016 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 "base/metrics/persistent_histogram_allocator.h"
 
 #include <memory>
 
 #include "base/atomicops.h"
 #include "base/files/file_path.h"
@@ skipping 767 matching lines @@
   }
   if (out_active_path) {
     *out_active_path =
         dir.AppendASCII(name.as_string() + std::string("-active"))
             .AddExtension(PersistentMemoryAllocator::kFileExtension);
   }
 }
 #endif  // !defined(OS_NACL)
 
 // static
 void GlobalHistogramAllocator::CreateWithSharedMemory(

[Ilya Sherman, 2017/03/06 19:03:19]

If you really want to keep this method around, could you please move it to an
anonymous namespace in this file?  It doesn't seem like it needs to be part of
the API for this class anymore.

     std::unique_ptr<SharedMemory> memory,
     size_t size,
     uint64_t id,
     StringPiece name) {
   if ((!memory->memory() && !memory->Map(size)) ||
       !SharedPersistentMemoryAllocator::IsSharedMemoryAcceptable(*memory)) {
     NOTREACHED();
     return;
   }
 
   DCHECK_LE(memory->mapped_size(), size);
   Set(WrapUnique(
       new GlobalHistogramAllocator(MakeUnique<SharedPersistentMemoryAllocator>(
-          std::move(memory), 0, StringPiece(), /*readonly=*/false))));
+          std::move(memory), id, name, /*readonly=*/false))));
 }
 
 // static
 void GlobalHistogramAllocator::CreateWithSharedMemoryHandle(
     const SharedMemoryHandle& handle,
     size_t size) {
   std::unique_ptr<SharedMemory> shm(
       new SharedMemory(handle, /*readonly=*/false));
-  if (!shm->Map(size) ||
-      !SharedPersistentMemoryAllocator::IsSharedMemoryAcceptable(*shm)) {
-    NOTREACHED();
-    return;
-  }
-
-  Set(WrapUnique(
-      new GlobalHistogramAllocator(MakeUnique<SharedPersistentMemoryAllocator>(
-          std::move(shm), 0, StringPiece(), /*readonly=*/false))));
+  CreateWithSharedMemory(std::move(shm), size, 0, StringPiece());
 }
 
 // static
 void GlobalHistogramAllocator::Set(
     std::unique_ptr<GlobalHistogramAllocator> allocator) {
   // Releasing or changing an allocator is extremely dangerous because it
   // likely has histograms stored within it. If the backing memory is also
   // also released, future accesses to those histograms will seg-fault.
   CHECK(!subtle::NoBarrier_Load(&g_allocator));
   subtle::Release_Store(&g_allocator,
@@ skipping 114 matching lines @@
   while (true) {
     std::unique_ptr<HistogramBase> histogram =
         import_iterator_.GetNextWithIgnore(record_to_ignore);
     if (!histogram)
       break;
     StatisticsRecorder::RegisterOrDeleteDuplicate(histogram.release());
   }
 }
 
 }  // namespace base