From 652d6971b19c2db2d3dcd1f8db36abadfc22079e Mon Sep 17 00:00:00 2001
From: Ben Chan <benchan@chromium.org>
Date: Wed, 3 Sep 2014 17:23:46 -0700
Subject: [PATCH] metrics: Include base/macros.h instead of base/basictypes.h

metrics no longer uses the integer types from base/basictypes.h. It
should simply include base/macros.h for the DISALLOW_COPY_AND_ASSIGN
macro instead.

BUG=None
TEST=`FEATURES=test emerge-$BOARD metrics platform2`

Change-Id: Id325bcb6c9d3318b5b78e42a04da9c53d0a8c3ce
Reviewed-on: https://chromium-review.googlesource.com/216349
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
---
 metrics/metrics_library.h      | 2 +-
 metrics/timer.h                | 1 +
 metrics/timer_mock.h           | 2 --
 metrics/uploader/metrics_log.h | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/metrics/metrics_library.h b/metrics/metrics_library.h
index 97b2b72e2..38ab47fdb 100644
--- a/metrics/metrics_library.h
+++ b/metrics/metrics_library.h
@@ -9,8 +9,8 @@
 #include <string>
 #include <unistd.h>
 
-#include <base/basictypes.h>
 #include <base/compiler_specific.h>
+#include <base/macros.h>
 #include <base/memory/scoped_ptr.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
diff --git a/metrics/timer.h b/metrics/timer.h
index 654c2cb31..52cc57892 100644
--- a/metrics/timer.h
+++ b/metrics/timer.h
@@ -9,6 +9,7 @@
 
 #include <string>
 
+#include <base/macros.h>
 #include <base/memory/scoped_ptr.h>
 #include <base/time/time.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
diff --git a/metrics/timer_mock.h b/metrics/timer_mock.h
index 6eef76152..2f2d0f4b6 100644
--- a/metrics/timer_mock.h
+++ b/metrics/timer_mock.h
@@ -5,10 +5,8 @@
 #ifndef METRICS_TIMER_MOCK_H_
 #define METRICS_TIMER_MOCK_H_
 
-
 #include <string>
 
-#include <base/basictypes.h>
 #include <gmock/gmock.h>
 
 #include "metrics/timer.h"
diff --git a/metrics/uploader/metrics_log.h b/metrics/uploader/metrics_log.h
index bd1958cbf..37a82bdd4 100644
--- a/metrics/uploader/metrics_log.h
+++ b/metrics/uploader/metrics_log.h
@@ -7,6 +7,8 @@
 
 #include <string>
 
+#include <base/macros.h>
+
 #include "components/metrics/metrics_log_base.h"
 
 // This file defines a set of user experience metrics data recorded by