commit 71a62efc54d08bc9668d00857fc59c4fe772c64c
author Bertrand SIMONNET <bsimonnet@chromium.org> Tue Oct 07 11:26:25 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Oct 10 06:54:05 2014 +0000
tree 218e73943bd00a0335cbf7959108af274fbba418
parent 67906c6bbbc4f9eb8e624f9dd61e866ccd77d724

metrics: add support for other product id

metrics_uploader should use the GOOGLE_METRICS_PRODUCT_ID field from os-release
whenever possible instead of the default Chrome product id.

BUG=chromium:415744
TEST=FEATURES=test emerge-gizmo metrics succeeds.
TEST=test_that platform_MetricsUploader succeeds.

CQ-DEPEND=CL:221963

Change-Id: I69b1a6ca766048ad80d93008a2fe3b18879bf1da
Reviewed-on: https://chromium-review.googlesource.com/221953
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>

metrics/metrics_daemon.h

diff --git a/metrics/metrics_daemon.h b/metrics/metrics_daemon.h
index 07072f9..7c7f8d2 100644
--- a/metrics/metrics_daemon.h
+++ b/metrics/metrics_daemon.h
@@ -39,7 +39,8 @@
             const std::string& scaling_max_freq_path,
             int upload_interval_secs,
             const std::string& server,
-            const std::string& metrics_file);
+            const std::string& metrics_file,
+            const std::string& config_root);
 
   // Does all the work. If |run_as_daemon| is true, daemonizes by
   // forking.
@@ -300,6 +301,9 @@
   // Test mode.
   bool testing_;
 
+  // Root of the configuration files to use.
+  std::string config_root_;
+
   // The metrics library handle.
   MetricsLibraryInterface* metrics_lib_;