commit cc67c52a2c00f90e877971d552208dd99825d84e
author Ben Chan <benchan@chromium.org> Wed Sep 03 07:19:18 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Sep 03 22:47:29 2014 +0000
tree 2796f91a927152e2be85926f0f29160b03669cf8
parent 94d308ae877bd6e7e605d4f813376885e34fda0d

shill: Include base/macros.h instead of base/basictypes.h

shill 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=`USE='cellular wimax' FEATURES=test emerge-$BOARD platform2`

Change-Id: I9b350c1bd9eff88e2c87de2ef8d607e90049e102
Reviewed-on: https://chromium-review.googlesource.com/216055
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

mock_ipconfig.h

diff --git a/mock_ipconfig.h b/mock_ipconfig.h
index 9929998..d35bbcc 100644
--- a/mock_ipconfig.h
+++ b/mock_ipconfig.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <gmock/gmock.h>
 
 #include "shill/ipconfig.h"