Attempt at fixing error on the Chrome Windows FYI bots.
It looks like our basictypes.h file in the overrides folder is including the file it is overriding due to include path precedence (Chrome's is lower than WebRTCs).
TBR=henrika@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/51909004
Cr-Original-Commit-Position: refs/heads/master@{#9280}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 32c2023fb625a5af9f6480ba9b91660285c5d57a
diff --git a/overrides/webrtc/base/basictypes.h b/overrides/webrtc/base/basictypes.h
index e75b8c8..0851b48 100644
--- a/overrides/webrtc/base/basictypes.h
+++ b/overrides/webrtc/base/basictypes.h
@@ -15,8 +15,10 @@
#ifndef OVERRIDES_WEBRTC_BASE_BASICTYPES_H__
#define OVERRIDES_WEBRTC_BASE_BASICTYPES_H__
-#include "base/basictypes.h"
-#include "build/build_config.h"
+// We can't include these files directly via "base/foo.h" since we might
+// inadvertently include the very files we're overriding.
+#include "../../../../../base/basictypes.h"
+#include "../../../../../build/build_config.h"
#ifndef INT_TYPES_DEFINED
#define INT_TYPES_DEFINED
