Fix compile error: redefined struct FunctorTraits

../..\base/bind_internal.h(415,8):  error: redefinition of 'FunctorTraits<R (*)(Args...) __attribute__((stdcall))>'

Bug: 893460
Change-Id: I370eb3d4cebf3171fb143cba9b022696c5a1ebb2
Reviewed-on: https://chromium-review.googlesource.com/c/1298831
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Taiju Tsuiki <tzik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603540}

base/bind_internal.h

@@ -417,7 +417,7 @@ struct FunctorTraits<R (*)(Args...)> {
   }
 };
 
-#if defined(OS_WIN) && !defined(ARCH_CPU_X86_64)
+#if defined(OS_WIN) && !defined(ARCH_CPU_64_BITS)
 
 // For functions.
 template <typename R, typename... Args>
@@ -445,7 +445,7 @@ struct FunctorTraits<R(__fastcall*)(Args...)> {
   }
 };
 
-#endif  // defined(OS_WIN) && !defined(ARCH_CPU_X86_64)
+#endif  // defined(OS_WIN) && !defined(ARCH_CPU_64_BITS)
 
 #if defined(OS_MACOSX)