Revert 194506 "intsafe workaround to separate header"

Broke x64 compile.

> intsafe workaround to separate header
> 
> Allows workaround to work without precompiled headers (as in
> buildtype=Official)
> 
> R=cpu@chromium.org
> BUG=225822
> 
> Review URL: https://codereview.chromium.org/14201003

TBR=scottmg@chromium.org

Review URL: https://codereview.chromium.org/13977005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194507 0039d316-1c4b-4281-b951-d872f2087c98

build/intsafe_workaround.h

-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BUILD_INTSAFE_WORKAROUND_H_
-#define BUILD_INTSAFE_WORKAROUND_H_
-
-// Workaround for:
-// http://connect.microsoft.com/VisualStudio/feedback/details/621653/
-// http://crbug.com/225822
-// Note that we can't actually include <stdint.h> here because there's other
-// code in third_party that has partial versions of stdint types that conflict.
-#include <intsafe.h>
-#undef INT8_MIN
-#undef INT16_MIN
-#undef INT32_MIN
-#undef INT64_MIN
-#undef INT8_MAX
-#undef UINT8_MAX
-#undef INT16_MAX
-#undef UINT16_MAX
-#undef INT32_MAX
-#undef UINT32_MAX
-#undef INT64_MAX
-#undef UINT64_MAX
-
-#endif  // BUILD_INTSAFE_WORKAROUND_H_

build/precompile.h

@@ -107,4 +107,21 @@
 #include <utility>
 #include <vector>
 
-#include "build/intsafe_workaround.h"
+// Workaround for:
+// http://connect.microsoft.com/VisualStudio/feedback/details/621653/
+// http://crbug.com/225822
+// Note that we can't actually include <stdint.h> here because there's other
+// code in third_party that has partial versions of stdint types that conflict.
+#include <intsafe.h>
+#undef INT8_MIN
+#undef INT16_MIN
+#undef INT32_MIN
+#undef INT64_MIN
+#undef INT8_MAX
+#undef UINT8_MAX
+#undef INT16_MAX
+#undef UINT16_MAX
+#undef INT32_MAX
+#undef UINT32_MAX
+#undef INT64_MAX
+#undef UINT64_MAX

win8/delegate_execute/delegate_execute.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "build/intsafe_workaround.h"
-
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>