Put BrowserMetrics with embedded profiles into subdir for auto-upload.

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"
 #include "base/files/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/persistent_sample_map.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/pickle.h"
+#include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 
 namespace base {
 
 namespace {
 
 // Name of histogram for storing results of local operations.
 const char kResultHistogram[] = "UMA.CreatePersistentHistogram.Result";
 
 // Type identifiers used when storing in persistent memory so they can be
@@ skipping 795 matching lines @@
             .AddExtension(PersistentMemoryAllocator::kFileExtension);
   }
   if (out_spare_path) {
     *out_spare_path =
         dir.AppendASCII(name.as_string() + std::string("-spare"))
             .AddExtension(PersistentMemoryAllocator::kFileExtension);
   }
 }
 
 // static
+void GlobalHistogramAllocator::ConstructFilePathsForUploadDir(
+    const FilePath& active_dir,
+    const FilePath& upload_dir,
+    const std::string& name,
+    FilePath* out_upload_path,
+    FilePath* out_active_path,
+    FilePath* out_spare_path) {
+  if (out_upload_path) {
+    std::string name_stamp =
+        StringPrintf("%s-%X", name.c_str(),
+                     static_cast<unsigned int>(Time::Now().ToTimeT()));
+    *out_upload_path =
+        upload_dir.AppendASCII(name_stamp)
+            .AddExtension(PersistentMemoryAllocator::kFileExtension);

[Alexei Svitkine (slow), 2017/06/28 17:30:35]

Nit: Given this pattern is used a lot, make a helper?

MakePersistentMetricsFilePath(dir, name)

So then all of these can be more concise. And update the ones above too.

[bcwhite, 2017/06/28 18:52:08]

Done.

+  }
+  if (out_active_path) {
+    *out_active_path =
+        active_dir.AppendASCII(name + std::string("-active"))
+            .AddExtension(PersistentMemoryAllocator::kFileExtension);
+  }
+  if (out_spare_path) {
+    *out_spare_path =
+        active_dir.AppendASCII(name + std::string("-spare"))
+            .AddExtension(PersistentMemoryAllocator::kFileExtension);
+  }
+}
+
+// static
 bool GlobalHistogramAllocator::CreateSpareFile(const FilePath& spare_path,
                                                size_t size) {
   FilePath temp_spare_path = spare_path.AddExtension(FILE_PATH_LITERAL(".tmp"));
   bool success = true;
   {
     File spare_file(temp_spare_path, File::FLAG_CREATE_ALWAYS |
                                          File::FLAG_READ | File::FLAG_WRITE);
     if (!spare_file.IsValid())
       return false;
 
@@ skipping 166 matching lines @@
   while (true) {
     std::unique_ptr<HistogramBase> histogram =
         import_iterator_.GetNextWithIgnore(record_to_ignore);
     if (!histogram)
       break;
     StatisticsRecorder::RegisterOrDeleteDuplicate(histogram.release());
   }
 }
 
 }  // namespace base