Integrate Crashpad UMA

chrome/browser/chrome_browser_field_trials.cc

 // Copyright (c) 2012 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/browser/chrome_browser_field_trials.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 25 matching lines @@
 
 // Check for feature enabling the use of persistent histogram storage and
 // enable the global allocator if so.
 // TODO(bcwhite): Move this and CreateInstallerFileMetricsProvider into a new
 // file and make kBrowserMetricsName local to that file.
 void InstantiatePersistentHistograms() {
   base::FilePath metrics_dir;
   if (!base::PathService::Get(chrome::DIR_USER_DATA, &metrics_dir))
     return;
 
-  base::FilePath metrics_file =
-      metrics_dir
-          .AppendASCII(ChromeMetricsServiceClient::kBrowserMetricsName)
-          .AddExtension(base::PersistentMemoryAllocator::kFileExtension);
-  base::FilePath active_file =
-      metrics_dir
-          .AppendASCII(
-              std::string(ChromeMetricsServiceClient::kBrowserMetricsName) +
-              "-active")
-          .AddExtension(base::PersistentMemoryAllocator::kFileExtension);
+  base::FilePath metrics_file, active_file;
+  base::GlobalHistogramAllocator::ConstructFilePaths(
+      metrics_dir, ChromeMetricsServiceClient::kBrowserMetricsName,
+      &metrics_file, &active_file);
 
   // Move any existing "active" file to the final name from which it will be
   // read when reporting initial stability metrics. If there is no file to
   // move, remove any old, existing file from before the previous session.
   if (!base::ReplaceFile(active_file, metrics_file, nullptr))
     base::DeleteFile(metrics_file, /*recursive=*/false);
 
   // This is used to report results to an UMA histogram. It's an int because
   // arithmetic is done on the value. The corresponding "failed" case must
   // always appear directly after the "success" case.
@@ skipping 37 matching lines @@
       base::GlobalHistogramAllocator::Get();
   UMA_HISTOGRAM_ENUMERATION("UMA.PersistentHistograms.InitResult",
                             result + (allocator ? 0 : 1),
                             CREATE_ALLOCATOR_RESULTS);
   if (!allocator)
     return;
 
   // Create tracking histograms for the allocator and record storage file.
   allocator->CreateTrackingHistograms(
       ChromeMetricsServiceClient::kBrowserMetricsName);
-  allocator->SetPersistentLocation(active_file);
 }
 
 // Create a field trial to control metrics/crash sampling for Stable on
 // Windows/Android if no variations seed was applied.
 void CreateFallbackSamplingTrialIfNeeded(bool has_seed,
                                          base::FeatureList* feature_list) {
 #if defined(OS_WIN) || defined(OS_ANDROID)
   // Only create the fallback trial if there isn't already a variations seed
   // being applied. This should occur during first run when first-run variations
   // isn't supported. It's assumed that, if there is a seed, then it either
@@ skipping 32 matching lines @@
     bool has_seed,
     base::FeatureList* feature_list) {
   CreateFallbackSamplingTrialIfNeeded(has_seed, feature_list);
 }
 
 void ChromeBrowserFieldTrials::InstantiateDynamicTrials() {
   // Persistent histograms must be enabled as soon as possible.
   InstantiatePersistentHistograms();
   tracing::SetupBackgroundTracingFieldTrial();
 }