Revert "Another dependency the bbot missed!!!"

This reverts commit 161f7fd3bdd425167af9fe26fdc5373a2ff44c98.

Revert "Missed a file as part of checkin for r48186"

This reverts commit cff86beba5938209393a6c3bccced62a7f3ff36b.

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

This reverts commit c78936bcfc65b98edf288191d927a495b0364621.

TBR=mbelshe

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

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

1 files changed, 10 insertions, 6 deletions

diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index fcad39c..966a388c 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -647,11 +647,15 @@ 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) &&
-      static_cast<int>(read) == size)
-    return read;
-  return -1;
+  if (::ReadFile(file, data, size, &read, NULL) && read == size) {
+    ret_value = static_cast<int>(read);
+  } else {
+    ret_value = -1;
+  }
+
+  return ret_value;
 }
 
 int WriteFile(const FilePath& filename, const char* data, int size) {
@@ -671,8 +675,8 @@ int WriteFile(const FilePath& filename, const char* data, int size) {
 
   DWORD written;
   BOOL result = ::WriteFile(file, data, size, &written, NULL);
-  if (result && static_cast<int>(written) == size)
-    return written;
+  if (result && written == size)
+    return static_cast<int>(written);
 
   if (!result) {
     // WriteFile failed.