Revert 48186, 48196, 48198

net/tools/dump_cache/upgrade.cc

-// 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.
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/io_buffer.h"
@@ skipping 348 matching lines @@
   if (input_->msg.result == RESULT_NAME_OVERFLOW) {
     // The key is too long. Just move on.
     printf("Skipping entry (name too long)\n");
     return SendGetPrevEntry();
   }
 
   if (input_->msg.result != RESULT_OK)
     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();
   }
 
   if (key.size() >= 64) {
     key[60] = '.';
     key[61] = '.';
     key[62] = '.';
     key[63] = '\0';
   }
   DEBUGMSG("Entry \"%s\" created\n", key.c_str());
@@ skipping 306 matching lines @@
   Message msg;
   msg.command = GET_KEY;
 
   if (!entry_ || input_->msg.long_arg1 != reinterpret_cast<int64>(entry_)) {
     msg.result =  RESULT_INVALID_PARAMETER;
   } else {
     std::string key = entry_->GetKey();
     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 {
       msg.result = RESULT_OK;
     }
   }
   SendMsg(msg);
 }
 
 void SlaveSM::DoGetUseTimes() {
@@ skipping 108 matching lines @@
 
   SlaveSM slave(input_path, pipe);
   if (!slave.DoInit()) {
     printf("Unable to talk with the main process\n");
     return -1;
   }
 
   loop.Run();
   return 0;
 }