From e10b548cf5e0f51f0de08e0c984b23b38640e0f9 Mon Sep 17 00:00:00 2001
From: Chris Masone <cmasone@chromium.org>
Date: Thu, 14 Feb 2013 12:15:35 -0800
Subject: [PATCH] [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           | 2 +-
 metrics/counter.cc         | 3 ++-
 metrics/counter_test.cc    | 2 +-
 metrics/metrics_library.cc | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/metrics/Makefile b/metrics/Makefile
index 54d927e7f..0774a24d9 100644
--- a/metrics/Makefile
+++ b/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)
diff --git a/metrics/counter.cc b/metrics/counter.cc
index 95d1faf87..9d94597db 100644
--- a/metrics/counter.cc
+++ b/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 {
diff --git a/metrics/counter_test.cc b/metrics/counter_test.cc
index 71fefd6c5..73a50db4a 100644
--- a/metrics/counter_test.cc
+++ b/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>
diff --git a/metrics/metrics_library.cc b/metrics/metrics_library.cc
index ff040e4fc..fe481228e 100644
--- a/metrics/metrics_library.cc
+++ b/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 \