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

base/metrics/persistent_histogram_allocator.h

 // 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.
 
 #ifndef BASE_METRICS_HISTOGRAM_PERSISTENCE_H_
 #define BASE_METRICS_HISTOGRAM_PERSISTENCE_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 417 matching lines @@
   // The spare path is a file that can be pre-created and moved to be active
   // without any startup penalty that comes from constructing the file. |name|
   // will be used as the basename of the file inside |dir|. |out_base_path|,
   // |out_active_path|, or |out_spare_path| may be null if not needed.
   static void ConstructFilePaths(const FilePath& dir,
                                  StringPiece name,
                                  FilePath* out_base_path,
                                  FilePath* out_active_path,
                                  FilePath* out_spare_path);
 
+  // As above but puts the base files in a different "upload" directory. This
+  // is useful when moving all completed files into a single directory for easy
+  // upload management.
+  static void 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);
+
   // Create a "spare" file that can later be made the "active" file. This
   // should be done on a background thread if possible.
   static bool CreateSpareFile(const FilePath& spare_path, size_t size);
 
   // Same as above but uses standard names. |name| is the name of the allocator
   // and is also used to create the correct filename.
   static bool CreateSpareFileInDir(const FilePath& dir_path,
                                    size_t size,
                                    StringPiece name);
 #endif
@@ skipping 49 matching lines @@
       std::unique_ptr<PersistentMemoryAllocator> memory);
 
   // Import new histograms from the global histogram allocator. It's possible
   // for other processes to create histograms in the active memory segment;
   // this adds those to the internal list of known histograms to avoid creating
   // duplicates that would have to be merged during reporting. Every call to
   // this method resumes from the last entry it saw; it costs nothing if
   // nothing new has been added.
   void ImportHistogramsToStatisticsRecorder();
 
+  // Builds a FilePath for a metrics file.
+  static FilePath MakeMetricsFilePath(const FilePath& dir, StringPiece name);
+
   // Import always continues from where it left off, making use of a single
   // iterator to continue the work.
   Iterator import_iterator_;
 
   // The location to which the data should be persisted.
   FilePath persistent_location_;
 
   DISALLOW_COPY_AND_ASSIGN(GlobalHistogramAllocator);
 };
 
 }  // namespace base
 
 #endif  // BASE_METRICS_HISTOGRAM_PERSISTENCE_H_