diff --git a/webrtc/base/arraysize.h b/webrtc/base/arraysize.h
index 0bb0a62ed8..56a10392af 100644
--- a/webrtc/base/arraysize.h
+++ b/webrtc/base/arraysize.h
@@ -24,16 +24,7 @@
 // This template function declaration is used in defining arraysize.
 // Note that the function doesn't need an implementation, as we only
 // use its type.
-template <typename T, size_t N>
-char (&ArraySizeHelper(T (&array)[N]))[N];
-
-// That gcc wants both of these prototypes seems mysterious. VC, for
-// its part, can't decide which to use (another mystery). Matching of
-// template overloads: the final frontier.
-#ifndef _MSC_VER
-template <typename T, size_t N>
-char (&ArraySizeHelper(const T (&array)[N]))[N];
-#endif
+template <typename T, size_t N> char (&ArraySizeHelper(T (&array)[N]))[N];
 
 #define arraysize(array) (sizeof(ArraySizeHelper(array)))
 
diff --git a/webrtc/overrides/webrtc/base/arraysize.h b/webrtc/overrides/webrtc/base/arraysize.h
deleted file mode 100644
index abc1240fe5..0000000000
--- a/webrtc/overrides/webrtc/base/arraysize.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// This file overrides the inclusion of webrtc/base/arraysize.h
-// We do this because in Chromium it redefines arraysize, which is already
-// defined in base/macros.h.
-
-#ifndef OVERRIDES_WEBRTC_BASE_ARRAYSIZE_H__
-#define OVERRIDES_WEBRTC_BASE_ARRAYSIZE_H__
-
-#include "base/macros.h"
-
-#endif  // OVERRIDES_WEBRTC_BASE_ARRAYSIZE_H__