Refactor histogram_persistence to be a class.

chrome/installer/setup/installer_metrics.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 "chrome/installer/setup/installer_metrics.h"
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_base.h"
-#include "base/metrics/histogram_persistence.h"
+#include "base/metrics/persistent_histogram_allocator.h"
 #include "base/metrics/persistent_memory_allocator.h"
 #include "chrome/installer/util/util_constants.h"
 
 namespace installer {
 
 void BeginPersistentHistogramStorage() {
-  base::SetPersistentHistogramMemoryAllocator(
-      new base::LocalPersistentMemoryAllocator(
-          1 << 20, 0,  // 1 MiB
-          installer::kSetupHistogramAllocatorName));
-  base::GetPersistentHistogramMemoryAllocator()->CreateTrackingHistograms(
-      installer::kSetupHistogramAllocatorName);
+  base::PersistentHistogramAllocator::SetGlobalAllocator(
+      make_scoped_ptr(new base::PersistentHistogramAllocator(
+          make_scoped_ptr(new base::LocalPersistentMemoryAllocator(
+              1 << 20, 0,  // 1 MiB
+              installer::kSetupHistogramAllocatorName)))));
+  base::PersistentHistogramAllocator::GetGlobalAllocator()
+      ->CreateTrackingHistograms(installer::kSetupHistogramAllocatorName);
 }
 
 void EndPersistentHistogramStorage(const base::FilePath& target_path) {
+  base::PersistentHistogramAllocator::GetGlobalAllocator()

[Alexei Svitkine (slow), 2016/03/07 16:40:43]

Nit: Save a pointer to base::PersistentHistogramAllocator::GetGlobalAllocator()
in a local since you call it also right below.

[bcwhite, 2016/03/08 00:24:04]

Done.

Hmmm...  Perhaps it's better to export the data() and used() methods directly
from the histogram-allocator and call those.

[Alexei Svitkine (slow), 2016/03/08 19:58:28]

Exporting them looks good.

+      ->UpdateTrackingHistograms();
+  base::PersistentMemoryAllocator* allocator =
+      base::PersistentHistogramAllocator::GetGlobalAllocator()
+          ->memory_allocator();
+
   // For atomicity, first write to a temporary file and then rename it.
   // The ImportantFileWriter would be good for this except it supports only
   // std::string for its data.
-  base::PersistentMemoryAllocator* allocator =
-      base::GetPersistentHistogramMemoryAllocator();
-  allocator->UpdateTrackingHistograms();
-
   base::FilePath file_path = target_path
       .AppendASCII(allocator->Name())
       .AddExtension(L".pma");
   base::FilePath tmp_file_path;
   base::DeleteFile(file_path, false);
 
   if (base::CreateTemporaryFileInDir(file_path.DirName(), &tmp_file_path)) {
     // Allocator doesn't support more than 1GB so can never overflow.
     int used = static_cast<int>(allocator->used());
     if (base::WriteFile(tmp_file_path,
                         static_cast<const char*>(allocator->data()),
                         used) == used) {
       if (base::ReplaceFile(tmp_file_path, file_path, nullptr)) {
         VLOG(1) << "Persistent histograms saved in file: "
                 << file_path.value();
       }
     }
     base::DeleteFile(tmp_file_path, false);
   }
 }
 
 }  // namespace installer