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 <[email protected]>
Reviewed-by: Alex Deymo <[email protected]>
Commit-Queue: Ben Chan <[email protected]>
diff --git a/subprocess.h b/subprocess.h
index 4279321..a666849 100644
--- a/subprocess.h
+++ b/subprocess.h
@@ -5,15 +5,15 @@
 #ifndef UPDATE_ENGINE_SUBPROCESS_H_
 #define UPDATE_ENGINE_SUBPROCESS_H_
 
+#include <glib.h>
+
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <glib.h>
-
-#include "base/basictypes.h"
-#include "base/logging.h"
+#include <base/logging.h>
+#include <base/macros.h>
 
 // The Subprocess class is a singleton. It's used to spawn off a subprocess
 // and get notified when the subprocess exits. The result of Exec() can