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>

http_fetcher.h

diff --git a/http_fetcher.h b/http_fetcher.h
index 9c92abb..b8c6ad6 100644
--- a/http_fetcher.h
+++ b/http_fetcher.h
@@ -9,10 +9,11 @@
 #include <string>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <glib.h>
+
 #include <base/callback.h>
 #include <base/logging.h>
-#include <glib.h>
+#include <base/macros.h>
 
 #include "update_engine/http_common.h"
 #include "update_engine/proxy_resolver.h"