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>
diff --git a/payload_generator/delta_diff_generator.h b/payload_generator/delta_diff_generator.h
index 3c4ad69..ee5a409 100644
--- a/payload_generator/delta_diff_generator.h
+++ b/payload_generator/delta_diff_generator.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include <base/basictypes.h>
+#include <base/macros.h>
#include "update_engine/payload_generator/graph_types.h"
#include "update_engine/update_metadata.pb.h"
diff --git a/payload_generator/extent_mapper.h b/payload_generator/extent_mapper.h
index 24229e1..98a5452 100644
--- a/payload_generator/extent_mapper.h
+++ b/payload_generator/extent_mapper.h
@@ -8,8 +8,6 @@
#include <string>
#include <vector>
-#include <base/basictypes.h>
-
#include "update_engine/update_metadata.pb.h"
namespace chromeos_update_engine {
diff --git a/payload_generator/extent_mapper_unittest.cc b/payload_generator/extent_mapper_unittest.cc
index 3b23246..f56cca0 100644
--- a/payload_generator/extent_mapper_unittest.cc
+++ b/payload_generator/extent_mapper_unittest.cc
@@ -12,7 +12,7 @@
#include <string>
#include <vector>
-#include <base/basictypes.h>
+#include <base/macros.h>
#include <gtest/gtest.h>
#include "update_engine/payload_constants.h"
diff --git a/payload_generator/graph_types.h b/payload_generator/graph_types.h
index a85346f..f94183f 100644
--- a/payload_generator/graph_types.h
+++ b/payload_generator/graph_types.h
@@ -11,7 +11,7 @@
#include <utility>
#include <vector>
-#include <base/basictypes.h>
+#include <base/macros.h>
#include "update_engine/update_metadata.pb.h"
diff --git a/payload_generator/graph_utils.cc b/payload_generator/graph_utils.cc
index dd5d9df..a0ce802 100644
--- a/payload_generator/graph_utils.cc
+++ b/payload_generator/graph_utils.cc
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include <base/basictypes.h>
#include <base/logging.h>
+#include <base/macros.h>
#include "update_engine/payload_constants.h"
diff --git a/payload_generator/graph_utils.h b/payload_generator/graph_utils.h
index 6712067..e4692e0 100644
--- a/payload_generator/graph_utils.h
+++ b/payload_generator/graph_utils.h
@@ -7,7 +7,7 @@
#include <vector>
-#include <base/basictypes.h>
+#include <base/macros.h>
#include "update_engine/payload_generator/graph_types.h"
#include "update_engine/update_metadata.pb.h"
diff --git a/payload_generator/payload_signer.h b/payload_generator/payload_signer.h
index 0c540e6..8fb0a70 100644
--- a/payload_generator/payload_signer.h
+++ b/payload_generator/payload_signer.h
@@ -8,7 +8,8 @@
#include <string>
#include <vector>
-#include <base/basictypes.h>
+#include <base/macros.h>
+
#include "update_engine/update_metadata.pb.h"
// This class encapsulates methods used for payload signing.