Enable warning 4389 as an error on windows builds. This will make

windows builds more similar to linux/mac, which already treat signed/
unsigned equality comparisons as warnings (and hence errors).

BUG=44471
TEST=none

Review URL: http://codereview.chromium.org/2081007

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

1 files changed, 6 insertions, 10 deletions

diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index 4f96ef3..fb65feb 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -656,15 +656,11 @@ int ReadFile(const FilePath& filename, char* data, int size) {
   if (file == INVALID_HANDLE_VALUE)
     return -1;
 
-  int ret_value;
   DWORD read;
-  if (::ReadFile(file, data, size, &read, NULL) && read == size) {
-    ret_value = static_cast<int>(read);
-  } else {
-    ret_value = -1;
-  }
-
-  return ret_value;
+  if (::ReadFile(file, data, size, &read, NULL) &&
+      static_cast<int>(read) == size)
+    return read;
+  return -1;
 }
 
 int WriteFile(const FilePath& filename, const char* data, int size) {
@@ -684,8 +680,8 @@ int WriteFile(const FilePath& filename, const char* data, int size) {
 
   DWORD written;
   BOOL result = ::WriteFile(file, data, size, &written, NULL);
-  if (result && written == size)
-    return static_cast<int>(written);
+  if (result && static_cast<int>(written) == size)
+    return written;
 
   if (!result) {
     // WriteFile failed.