Revert cl 9528 to fix mac test_shell_tests

net/tools/dump_cache/upgrade.cc

 // 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/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
-#include "net/base/io_buffer.h"
 #include "net/disk_cache/backend_impl.h"
 #include "net/disk_cache/entry_impl.h"
 
 namespace {
 
 const wchar_t kPipePrefix[] = L"\\\\.\\pipe\\dump_cache_";
 const int kChannelSize = 64 * 1024;
 const int kNumStreams = 4;
 
 // Simple macro to print out formatted debug messages. It is similar to a DLOG
@@ skipping 419 matching lines @@
   if (input_->msg.result != RESULT_OK)
     return Fail();
 
   int read_size = input_->msg.buffer_bytes;
   if (!read_size) {
     printf("Read failed, entry \"%s\" truncated!\n", entry_->GetKey().c_str());
     bytes_remaining_ = 0;
     return SendReadData();
   }
 
-  scoped_refptr<net::WrappedIOBuffer> buf =
-      new net::WrappedIOBuffer(input_->buffer);
-  if (read_size != entry_->WriteData(stream_, offset_, buf, read_size, NULL,
-                                     false))
+  if (read_size != entry_->WriteData(stream_, offset_, input_->buffer,
+                                     read_size, NULL, false))
     return Fail();
 
   offset_ += read_size;
   bytes_remaining_ -= read_size;
   // Read some more.
   SendReadData();
 }
 
 void MasterSM::SendQuit() {
   DEBUGMSG("Master SendQuit\n");
@@ skipping 247 matching lines @@
   DEBUGMSG("\t\t\tSlave DoReadData\n");
   Message msg;
   msg.command = READ_DATA;
 
   int stream = input_->msg.arg1;
   int size = input_->msg.arg2;
   if (!entry_ || input_->msg.long_arg1 != reinterpret_cast<int64>(entry_) ||
       stream < 0 || stream > 1 || size > kBufferSize) {
     msg.result =  RESULT_INVALID_PARAMETER;
   } else {
-    scoped_refptr<net::WrappedIOBuffer> buf =
-        new net::WrappedIOBuffer(output_->buffer);
-    int ret = entry_->ReadData(stream, input_->msg.arg3, buf, size, NULL);
+    int ret = entry_->ReadData(stream, input_->msg.arg3, output_->buffer, size,
+                               NULL);
 
     msg.buffer_bytes = (ret < 0) ? 0 : ret;
     msg.result = RESULT_OK;
   }
   SendMsg(msg);
 }
 
 void SlaveSM::DoEnd() {
   DEBUGMSG("\t\t\tSlave DoEnd\n");
   MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
@@ skipping 65 matching lines @@
 
   SlaveSM slave(&cache, pipe);
   if (!slave.DoInit()) {
     printf("Unable to talk with the main process\n");
     return -1;
   }
 
   loop.Run();
   return 0;
 }