[metrics] Update metrics to build against libchrome-180609

base/eintr_wrapper.h moved to base/posix/eintr_wrapper.h

CQ-DEPEND=Ib19c1382ab28ae7632728aa672478da2feb3950e

BUG=chromium-os:38941
TEST=emerge the metrics package with tests enabled.
STATUS=Fixed

Change-Id: I5d72d8934930ce394786ee151fd8f390b5caf2e1
Reviewed-on: https://gerrit.chromium.org/gerrit/43297
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
Commit-Queue: Chris Masone <cmasone@chromium.org>

metrics/Makefile

@@ -5,7 +5,7 @@
 # Makefile for metrics utilities -- library, client and daemon
 #
 
-BASE_VER ?= 125070
+BASE_VER ?= 180609
 PKG_CONFIG ?= pkg-config
 PC_DEPS = dbus-1 glib-2.0 gthread-2.0 dbus-glib-1 \
 	libchrome-$(BASE_VER) libchromeos-$(BASE_VER)

metrics/counter.cc

@@ -6,8 +6,9 @@
 
 #include <fcntl.h>
 
-#include <base/eintr_wrapper.h>
 #include <base/logging.h>
+#include <base/posix/eintr_wrapper.h>
+
 #include "metrics_library.h"
 
 namespace chromeos_metrics {

metrics/counter_test.cc

@@ -4,9 +4,9 @@
 
 #include <sys/file.h>
 
-#include <base/eintr_wrapper.h>
 #include <base/file_util.h>
 #include <base/logging.h>
+#include <base/posix/eintr_wrapper.h>
 #include <base/string_util.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>

metrics/metrics_library.cc

@@ -12,7 +12,9 @@
 #include <cstdio>
 #include <cstring>
 
-#include "base/eintr_wrapper.h"  // HANDLE_EINTR macro, no libbase required.
+// HANDLE_EINTR macro, no libbase required.
+#include <base/posix/eintr_wrapper.h>
+
 #include "policy/device_policy.h"
 
 #define READ_WRITE_ALL_FILE_FLAGS \