Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

net/base/file_stream_unittest.cc

 // Copyright (c) 2012 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 "net/base/file_stream.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 185 matching lines @@
   EXPECT_EQ(OK, callback.WaitForResult());
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   int total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
     scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
-    rv = stream.Read(buf, buf->size(), callback.callback());
+    rv = stream.Read(buf.get(), buf->size(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
     data_read.append(buf->data(), rv);
   }
   EXPECT_EQ(file_size, total_bytes_read);
   EXPECT_EQ(kTestData, data_read);
@@ skipping 10 matching lines @@
               base::PLATFORM_FILE_ASYNC;
   TestCompletionCallback callback;
   int rv = stream->Open(temp_file_path(), flags, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
 
   int64 total_bytes_avail = stream->Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
-  rv = stream->Read(buf, buf->size(), callback.callback());
+  rv = stream->Read(buf.get(), buf->size(), callback.callback());
   stream.reset();  // Delete instead of closing it.
   if (rv < 0) {
     EXPECT_EQ(ERR_IO_PENDING, rv);
     // The callback should not be called if the request is cancelled.
     base::MessageLoop::current()->RunUntilIdle();
     EXPECT_FALSE(callback.have_result());
   } else {
     EXPECT_EQ(std::string(kTestData, rv), std::string(buf->data(), rv));
   }
 }
@@ skipping 55 matching lines @@
   EXPECT_EQ(kOffset, new_offset);
 
   int64 total_bytes_avail = stream.Available();
   EXPECT_EQ(file_size - kOffset, total_bytes_avail);
 
   int total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
     scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
-    rv = stream.Read(buf, buf->size(), callback.callback());
+    rv = stream.Read(buf.get(), buf->size(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
     data_read.append(buf->data(), rv);
   }
   EXPECT_EQ(file_size - kOffset, total_bytes_read);
   EXPECT_EQ(kTestData + kOffset, data_read);
@@ skipping 91 matching lines @@
 
   int64 file_size;
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(0, file_size);
 
   int total_bytes_written = 0;
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   scoped_refptr<DrainableIOBuffer> drainable =
-      new DrainableIOBuffer(buf, buf->size());
+      new DrainableIOBuffer(buf.get(), buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream.Write(drainable, drainable->BytesRemaining(),
-                      callback.callback());
+    rv = stream.Write(
+        drainable.get(), drainable->BytesRemaining(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
     drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(file_size, total_bytes_written);
 }
 
 TEST_F(FileStreamTest, AsyncWrite_EarlyDelete) {
   scoped_ptr<FileStream> stream(new FileStream(NULL));
   int flags = base::PLATFORM_FILE_CREATE_ALWAYS |
               base::PLATFORM_FILE_WRITE |
               base::PLATFORM_FILE_ASYNC;
   TestCompletionCallback callback;
   int rv = stream->Open(temp_file_path(), flags, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
 
   int64 file_size;
   bool ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(0, file_size);
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
-  rv = stream->Write(buf, buf->size(), callback.callback());
+  rv = stream->Write(buf.get(), buf->size(), callback.callback());
   stream.reset();
   if (rv < 0) {
     EXPECT_EQ(ERR_IO_PENDING, rv);
     // The callback should not be called if the request is cancelled.
     base::MessageLoop::current()->RunUntilIdle();
     EXPECT_FALSE(callback.have_result());
   } else {
     ok = file_util::GetFileSize(temp_file_path(), &file_size);
     EXPECT_TRUE(ok);
     EXPECT_EQ(file_size, rv);
@@ skipping 43 matching lines @@
   const int64 kOffset = 0;
   rv = stream.Seek(FROM_END, kOffset, callback64.callback());
   ASSERT_EQ(ERR_IO_PENDING, rv);
   int64 new_offset = callback64.WaitForResult();
   EXPECT_EQ(kTestDataSize, new_offset);
 
   int total_bytes_written = 0;
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   scoped_refptr<DrainableIOBuffer> drainable =
-      new DrainableIOBuffer(buf, buf->size());
+      new DrainableIOBuffer(buf.get(), buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream.Write(drainable, drainable->BytesRemaining(),
-                      callback.callback());
+    rv = stream.Write(
+        drainable.get(), drainable->BytesRemaining(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
     drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
@@ skipping 103 matching lines @@
   EXPECT_EQ(OK, callback.WaitForResult());
 
   int64 total_bytes_avail = stream->Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   int64 total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
     scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
-    rv = stream->Read(buf, buf->size(), callback.callback());
+    rv = stream->Read(buf.get(), buf->size(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
     data_read.append(buf->data(), rv);
   }
   EXPECT_EQ(file_size, total_bytes_read);
   EXPECT_TRUE(data_read == kTestData);
 
   int total_bytes_written = 0;
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   scoped_refptr<DrainableIOBuffer> drainable =
-      new DrainableIOBuffer(buf, buf->size());
+      new DrainableIOBuffer(buf.get(), buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream->Write(drainable, drainable->BytesRemaining(),
-                       callback.callback());
+    rv = stream->Write(
+        drainable.get(), drainable->BytesRemaining(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
     drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
 
   stream.reset();
@@ skipping 24 matching lines @@
   TestInt64CompletionCallback callback64;
   rv = stream->Seek(FROM_END, 0, callback64.callback());
   ASSERT_EQ(ERR_IO_PENDING, rv);
   int64 offset = callback64.WaitForResult();
   EXPECT_EQ(offset, file_size);
 
   int total_bytes_written = 0;
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
   scoped_refptr<DrainableIOBuffer> drainable =
-      new DrainableIOBuffer(buf, buf->size());
+      new DrainableIOBuffer(buf.get(), buf->size());
   while (total_bytes_written != kTestDataSize) {
-    rv = stream->Write(drainable, drainable->BytesRemaining(),
-                      callback.callback());
+    rv = stream->Write(
+        drainable.get(), drainable->BytesRemaining(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LT(0, rv);
     if (rv <= 0)
       break;
     drainable->DidConsume(rv);
     total_bytes_written += rv;
   }
 
   EXPECT_EQ(kTestDataSize, total_bytes_written);
 
   rv = stream->Seek(FROM_BEGIN, 0, callback64.callback());
   ASSERT_EQ(ERR_IO_PENDING, rv);
   offset = callback64.WaitForResult();
   EXPECT_EQ(0, offset);
 
   int total_bytes_read = 0;
 
   std::string data_read;
   for (;;) {
     scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
-    rv = stream->Read(buf, buf->size(), callback.callback());
+    rv = stream->Read(buf.get(), buf->size(), callback.callback());
     if (rv == ERR_IO_PENDING)
       rv = callback.WaitForResult();
     EXPECT_LE(0, rv);
     if (rv <= 0)
       break;
     total_bytes_read += rv;
     data_read.append(buf->data(), rv);
   }
   stream.reset();
 
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(kTestDataSize * 2, file_size);
 
   EXPECT_EQ(kTestDataSize * 2, total_bytes_read);
   const std::string kExpectedFileData =
       std::string(kTestData) + std::string(kTestData);
   EXPECT_EQ(kExpectedFileData, data_read);
 }
 
 class TestWriteReadCompletionCallback {
  public:
-  TestWriteReadCompletionCallback(
-      FileStream* stream,
-      int* total_bytes_written,
-      int* total_bytes_read,
-      std::string* data_read)
+  TestWriteReadCompletionCallback(FileStream* stream,
+                                  int* total_bytes_written,
+                                  int* total_bytes_read,
+                                  std::string* data_read)
       : result_(0),
         have_result_(false),
         waiting_for_result_(false),
         stream_(stream),
         total_bytes_written_(total_bytes_written),
         total_bytes_read_(total_bytes_read),
         data_read_(data_read),
         callback_(base::Bind(&TestWriteReadCompletionCallback::OnComplete,
                              base::Unretained(this))),
         test_data_(CreateTestDataBuffer()),
-        drainable_(new DrainableIOBuffer(test_data_, kTestDataSize)) {
-  }
+        drainable_(new DrainableIOBuffer(test_data_.get(), kTestDataSize)) {}
 
   int WaitForResult() {
     DCHECK(!waiting_for_result_);
     while (!have_result_) {
       waiting_for_result_ = true;
       base::MessageLoop::current()->Run();
       waiting_for_result_ = false;
     }
     have_result_ = false;  // auto-reset for next callback
     return result_;
   }
 
   const CompletionCallback& callback() const { return callback_; }
 
  private:
   void OnComplete(int result) {
     DCHECK_LT(0, result);
     *total_bytes_written_ += result;
 
     int rv;
 
     if (*total_bytes_written_ != kTestDataSize) {
       // Recurse to finish writing all data.
       int total_bytes_written = 0, total_bytes_read = 0;
       std::string data_read;
       TestWriteReadCompletionCallback callback(
           stream_, &total_bytes_written, &total_bytes_read, &data_read);
-      rv = stream_->Write(drainable_, drainable_->BytesRemaining(),
-                          callback.callback());
+      rv = stream_->Write(
+          drainable_.get(), drainable_->BytesRemaining(), callback.callback());
       DCHECK_EQ(ERR_IO_PENDING, rv);
       rv = callback.WaitForResult();
       drainable_->DidConsume(total_bytes_written);
       *total_bytes_written_ += total_bytes_written;
       *total_bytes_read_ += total_bytes_read;
       *data_read_ += data_read;
     } else {  // We're done writing all data.  Start reading the data.
       stream_->SeekSync(FROM_BEGIN, 0);
 
       TestCompletionCallback callback;
       for (;;) {
         scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
-        rv = stream_->Read(buf, buf->size(), callback.callback());
+        rv = stream_->Read(buf.get(), buf->size(), callback.callback());
         if (rv == ERR_IO_PENDING) {
           base::MessageLoop::ScopedNestableTaskAllower allow(
               base::MessageLoop::current());
           rv = callback.WaitForResult();
         }
         EXPECT_LE(0, rv);
         if (rv <= 0)
           break;
         *total_bytes_read_ += rv;
         data_read_->append(buf->data(), rv);
@@ skipping 41 matching lines @@
   int64 offset = stream->SeekSync(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   int total_bytes_written = 0;
   int total_bytes_read = 0;
   std::string data_read;
   TestWriteReadCompletionCallback callback(stream.get(), &total_bytes_written,
                                            &total_bytes_read, &data_read);
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
-  rv = stream->Write(buf, buf->size(), callback.callback());
+  rv = stream->Write(buf.get(), buf->size(), callback.callback());
   if (rv == ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_LT(0, rv);
   EXPECT_EQ(kTestDataSize, total_bytes_written);
 
   stream.reset();
 
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(kTestDataSize * 2, file_size);
 
   EXPECT_EQ(kTestDataSize * 2, total_bytes_read);
   const std::string kExpectedFileData =
       std::string(kTestData) + std::string(kTestData);
   EXPECT_EQ(kExpectedFileData, data_read);
 }
 
 class TestWriteCloseCompletionCallback {
  public:
   TestWriteCloseCompletionCallback(FileStream* stream, int* total_bytes_written)
       : result_(0),
         have_result_(false),
         waiting_for_result_(false),
         stream_(stream),
         total_bytes_written_(total_bytes_written),
         callback_(base::Bind(&TestWriteCloseCompletionCallback::OnComplete,
                              base::Unretained(this))),
         test_data_(CreateTestDataBuffer()),
-        drainable_(new DrainableIOBuffer(test_data_, kTestDataSize)) {
-  }
+        drainable_(new DrainableIOBuffer(test_data_.get(), kTestDataSize)) {}
 
   int WaitForResult() {
     DCHECK(!waiting_for_result_);
     while (!have_result_) {
       waiting_for_result_ = true;
       base::MessageLoop::current()->Run();
       waiting_for_result_ = false;
     }
     have_result_ = false;  // auto-reset for next callback
     return result_;
   }
 
   const CompletionCallback& callback() const { return callback_; }
 
  private:
   void OnComplete(int result) {
     DCHECK_LT(0, result);
     *total_bytes_written_ += result;
 
     int rv;
 
     if (*total_bytes_written_ != kTestDataSize) {
       // Recurse to finish writing all data.
       int total_bytes_written = 0;
       TestWriteCloseCompletionCallback callback(stream_, &total_bytes_written);
-      rv = stream_->Write(drainable_, drainable_->BytesRemaining(),
-                          callback.callback());
+      rv = stream_->Write(
+          drainable_.get(), drainable_->BytesRemaining(), callback.callback());
       DCHECK_EQ(ERR_IO_PENDING, rv);
       rv = callback.WaitForResult();
       drainable_->DidConsume(total_bytes_written);
       *total_bytes_written_ += total_bytes_written;
     }
 
     result_ = *total_bytes_written_;
     have_result_ = true;
     if (waiting_for_result_)
       base::MessageLoop::current()->Quit();
@@ skipping 29 matching lines @@
   int64 total_bytes_avail = stream->Available();
   EXPECT_EQ(file_size, total_bytes_avail);
 
   int64 offset = stream->SeekSync(FROM_END, 0);
   EXPECT_EQ(offset, file_size);
 
   int total_bytes_written = 0;
   TestWriteCloseCompletionCallback callback(stream.get(), &total_bytes_written);
 
   scoped_refptr<IOBufferWithSize> buf = CreateTestDataBuffer();
-  rv = stream->Write(buf, buf->size(), callback.callback());
+  rv = stream->Write(buf.get(), buf->size(), callback.callback());
   if (rv == ERR_IO_PENDING)
     total_bytes_written = callback.WaitForResult();
   EXPECT_LT(0, total_bytes_written);
   EXPECT_EQ(kTestDataSize, total_bytes_written);
 
   stream.reset();
 
   ok = file_util::GetFileSize(temp_file_path(), &file_size);
   EXPECT_TRUE(ok);
   EXPECT_EQ(kTestDataSize * 2, file_size);
@@ skipping 49 matching lines @@
   int flags = base::PLATFORM_FILE_CREATE_ALWAYS |
               base::PLATFORM_FILE_WRITE |
               base::PLATFORM_FILE_ASYNC;
   TestCompletionCallback callback;
   int rv = stream->Open(temp_file_path(), flags, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
 
   // Try passing NULL buffer to Write() and check that it fails.
   scoped_refptr<IOBuffer> buf = new WrappedIOBuffer(NULL);
-  rv = stream->Write(buf, 1, callback.callback());
+  rv = stream->Write(buf.get(), 1, callback.callback());
   if (rv == ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_LT(rv, 0);
 }
 
 // Verify that async Read() errors are mapped correctly.
 TEST_F(FileStreamTest, AsyncReadError) {
   scoped_ptr<FileStream> stream(new FileStream(NULL));
   int flags = base::PLATFORM_FILE_OPEN |
               base::PLATFORM_FILE_READ |
               base::PLATFORM_FILE_ASYNC;
   TestCompletionCallback callback;
   int rv = stream->Open(temp_file_path(), flags, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
 
   // Try passing NULL buffer to Read() and check that it fails.
   scoped_refptr<IOBuffer> buf = new WrappedIOBuffer(NULL);
-  rv = stream->Read(buf, 1, callback.callback());
+  rv = stream->Read(buf.get(), 1, callback.callback());
   if (rv == ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_LT(rv, 0);
 }
 
 }  // namespace
 
 }  // namespace net