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

5 files changed, 12 insertions, 16 deletions

diff --git a/net/base/listen_socket_unittest.cc b/net/base/listen_socket_unittest.cc
index ed2b566..eb224c3 100644
--- a/net/base/listen_socket_unittest.cc
+++ b/net/base/listen_socket_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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.
 
@@ -54,7 +54,7 @@ void ListenSocketTester::SetUp() {
 
   // verify the connect/accept and setup test_socket_
   test_socket_ = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-  ASSERT_NE(INVALID_SOCKET, test_socket_);
+  ASSERT_NE(-1, test_socket_);
   struct sockaddr_in client;
   client.sin_family = AF_INET;
   client.sin_addr.s_addr = inet_addr(kLoopback);
diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc
index 02b1834..8ae39fb 100644
--- a/net/base/network_change_notifier_win.cc
+++ b/net/base/network_change_notifier_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -51,7 +51,7 @@ NetworkChangeNotifierWin::Impl::~Impl() {
 void NetworkChangeNotifierWin::Impl::WatchForAddressChange() {
   HANDLE handle = NULL;
   DWORD ret = NotifyAddrChange(&handle, &addr_overlapped_);
-  CHECK(ret == ERROR_IO_PENDING);
+  CHECK_EQ(ERROR_IO_PENDING, ret);
   addr_watcher_.StartWatching(addr_overlapped_.hEvent, this);
 }
 
diff --git a/net/socket/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc
index c663992..7c6f41d 100644
--- a/net/socket/tcp_client_socket_win.cc
+++ b/net/socket/tcp_client_socket_win.cc
@@ -508,7 +508,7 @@ int TCPClientSocketWin::Read(IOBuffer* buf,
   core_->read_buffer_.buf = buf->data();
 
   // TODO(wtc): Remove the CHECK after enough testing.
-  CHECK_EQ(static_cast<DWORD>(WAIT_TIMEOUT),
+  CHECK_EQ(WAIT_TIMEOUT,
            WaitForSingleObject(core_->read_overlapped_.hEvent, 0));
   DWORD num, flags = 0;
   int rv = WSARecv(socket_, &core_->read_buffer_, 1, &num, &flags,
@@ -558,7 +558,7 @@ int TCPClientSocketWin::Write(IOBuffer* buf,
   core_->write_buffer_length_ = buf_len;
 
   // TODO(wtc): Remove the CHECK after enough testing.
-  CHECK_EQ(static_cast<DWORD>(WAIT_TIMEOUT),
+  CHECK_EQ(WAIT_TIMEOUT,
            WaitForSingleObject(core_->write_overlapped_.hEvent, 0));
   DWORD num;
   int rv = WSASend(socket_, &core_->write_buffer_, 1, &num, 0,
diff --git a/net/tools/dump_cache/cache_dumper.cc b/net/tools/dump_cache/cache_dumper.cc
index a2e071a3..20ba6b5 100644
--- a/net/tools/dump_cache/cache_dumper.cc
+++ b/net/tools/dump_cache/cache_dumper.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -89,10 +89,6 @@ bool DiskDumper::CreateEntry(const std::string& key,
 #ifdef WIN32_LARGE_FILENAME_SUPPORT
   entry_ = CreateFileW(file.c_str(), GENERIC_WRITE|GENERIC_READ, 0, 0,
                        CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
-  if (entry_ == INVALID_HANDLE_VALUE) {
-    wprintf(L"CreateFileW (%s) failed: %d\n", file.c_str(), GetLastError());
-    return false;
-  }
   return entry_ != INVALID_HANDLE_VALUE;
 #else
   entry_ = file_util::OpenFile(entry_path_, "w+");
@@ -188,7 +184,7 @@ bool DiskDumper::WriteEntry(disk_cache::Entry* entry, int index, int offset,
 #ifdef WIN32_LARGE_FILENAME_SUPPORT
   DWORD bytes;
   DWORD rv = WriteFile(entry_, data, len, &bytes, 0);
-  return rv == TRUE && bytes == static_cast<DWORD>(len);
+  return rv == TRUE && bytes == len;
 #else
   int bytes = fwrite(data, 1, len, entry_);
   return bytes == len;
diff --git a/net/tools/dump_cache/upgrade.cc b/net/tools/dump_cache/upgrade.cc
index 71031dc..566eb0b 100644
--- a/net/tools/dump_cache/upgrade.cc
+++ b/net/tools/dump_cache/upgrade.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2008 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.
 
@@ -367,11 +367,11 @@ void MasterSM::DoGetKey(int bytes_read) {
     return Fail();
 
   std::string key(input_->buffer);
-  DCHECK(key.size() == static_cast<size_t>(input_->msg.buffer_bytes - 1));
+  DCHECK(key.size() == input_->msg.buffer_bytes - 1);
 
   if (!writer_->CreateEntry(key,
                             reinterpret_cast<disk_cache::Entry**>(&entry_))) {
-    printf("Skipping entry \"%s\": %d\n", key.c_str(), GetLastError());
+    printf("Skipping entry \"%s\" (name conflict!)\n", key.c_str());
     return SendGetPrevEntry();
   }
 
@@ -698,7 +698,7 @@ void SlaveSM::DoGetKey() {
     msg.buffer_bytes = std::min(key.size() + 1,
                                 static_cast<size_t>(kBufferSize));
     memcpy(output_->buffer, key.c_str(), msg.buffer_bytes);
-    if (msg.buffer_bytes != static_cast<int32>(key.size() + 1)) {
+    if (msg.buffer_bytes != key.size() + 1) {
       // We don't support moving this entry. Just tell the master.
       msg.result = RESULT_NAME_OVERFLOW;
     } else {