commit 05735a1879a553153458aae0a25fa5d42e3e408f
author Ben Chan <benchan@chromium.org> Wed Sep 03 07:48:22 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Sep 03 22:48:01 2014 +0000
tree 7ef78e7813ad73cc2cdcacf99b775d8e94697624
parent ec7f91625b799abf67ea3119490f2f1de8e4e677

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

update_engine 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 update_engine`

Change-Id: Idf18bc69339b7170122b289342c724c862454062
Reviewed-on: https://chromium-review.googlesource.com/216140
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

mock_file_writer.h

diff --git a/mock_file_writer.h b/mock_file_writer.h
index f14b6ff..5231e40 100644
--- a/mock_file_writer.h
+++ b/mock_file_writer.h
@@ -7,7 +7,8 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
+#include <base/macros.h>
+
 #include "update_engine/file_writer.h"
 
 // MockFileWriter is an implementation of FileWriter. It will succeed