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/update_manager/boxed_value.h b/update_manager/boxed_value.h
index 6b547b6..1ad9946 100644
--- a/update_manager/boxed_value.h
+++ b/update_manager/boxed_value.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 
 namespace chromeos_update_manager {
 
diff --git a/update_manager/provider.h b/update_manager/provider.h
index 13240fb..aac92d4 100644
--- a/update_manager/provider.h
+++ b/update_manager/provider.h
@@ -5,7 +5,7 @@
 #ifndef UPDATE_ENGINE_UPDATE_MANAGER_PROVIDER_H_
 #define UPDATE_ENGINE_UPDATE_MANAGER_PROVIDER_H_
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 
 namespace chromeos_update_manager {