Narrower include for constructormagic.h in Chromium.
Replacing #include of "base/basictypes.h" in
overrides/webrtc/base/constructormagic.h with "base/macros.h". Our
version of constructormagic.h is not meant to include the base types,
only DISALLOW_COPY_AND_ASSIGN etc.
This fix is also a workaround for our overrides in Chromium seemingly
including the wrong things for certain webrtc targets like
audio_processing, so it looks like this #include "base/basictypes.h"
didn't include Chromium's base/basictypes.h but webrtc/base/basictypes.h
somehow, hence DISALLOW_COPY_AND_ASSIGN wasn't defined, causing the
revert in r7151.
R=henrike@webrtc.org, tommi@webrtc.org
BUG=3070
TEST=Chromium still builds locally with this change.
Review URL: https://webrtc-codereview.appspot.com/27509004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7204 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/overrides/webrtc/base/constructormagic.h b/overrides/webrtc/base/constructormagic.h
index bb89f91..72b334c 100644
--- a/overrides/webrtc/base/constructormagic.h
+++ b/overrides/webrtc/base/constructormagic.h
@@ -15,6 +15,6 @@
#ifndef OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
#define OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
-#include "base/basictypes.h"
+#include "base/macros.h"
#endif // OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
