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

Linux fixes

BUG=110610
TBR=darin

Review URL: https://chromiumcodereview.appspot.com/15829004

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

3 files changed, 9 insertions, 8 deletions

diff --git a/net/disk_cache/flash/flash_entry_impl.cc b/net/disk_cache/flash/flash_entry_impl.cc
index 3d64b03..01224029 100644
--- a/net/disk_cache/flash/flash_entry_impl.cc
+++ b/net/disk_cache/flash/flash_entry_impl.cc
@@ -31,14 +31,15 @@ FlashEntryImpl::FlashEntryImpl(int32 id,
 }
 
 int FlashEntryImpl::Init(const CompletionCallback& callback) {
-  if (new_internal_entry_) {
+  if (new_internal_entry_.get()) {
     DCHECK(callback.is_null());
     init_ = true;
     return net::OK;
   }
-  DCHECK(!callback.is_null() && old_internal_entry_);
+  DCHECK(!callback.is_null() && old_internal_entry_.get());
   callback_ = callback;
-  PostTaskAndReplyWithResult(cache_thread_, FROM_HERE,
+  PostTaskAndReplyWithResult(cache_thread_.get(),
+                             FROM_HERE,
                              Bind(&InternalEntry::Init, old_internal_entry_),
                              Bind(&FlashEntryImpl::OnInitComplete, this));
   return net::ERR_IO_PENDING;
diff --git a/net/disk_cache/flash/internal_entry.cc b/net/disk_cache/flash/internal_entry.cc
index 14659732..c6bae89 100644
--- a/net/disk_cache/flash/internal_entry.cc
+++ b/net/disk_cache/flash/internal_entry.cc
@@ -71,13 +71,13 @@ void InternalEntry::Close() {
 bool InternalEntry::WriteKey(LogStoreEntry* entry, const std::string& key) {
   int key_size = static_cast<int>(key.size());
   scoped_refptr<IOBuffer> key_buf(new StringIOBuffer(key));
-  return entry->WriteData(0, 0, key_buf, key_size) == key_size;
+  return entry->WriteData(0, 0, key_buf.get(), key_size) == key_size;
 }
 
 bool InternalEntry::ReadKey(LogStoreEntry* entry, std::string* key) {
   int key_size = entry->GetDataSize(0);
   scoped_refptr<net::IOBuffer> key_buf(new net::IOBuffer(key_size));
-  if (entry->ReadData(0, 0, key_buf, key_size) != key_size)
+  if (entry->ReadData(0, 0, key_buf.get(), key_size) != key_size)
     return false;
   key->assign(key_buf->data(), key_size);
   return true;
diff --git a/net/disk_cache/flash/log_store_entry_unittest.cc b/net/disk_cache/flash/log_store_entry_unittest.cc
index d15616f..100c9a8 100644
--- a/net/disk_cache/flash/log_store_entry_unittest.cc
+++ b/net/disk_cache/flash/log_store_entry_unittest.cc
@@ -29,7 +29,7 @@ TEST_F(FlashCacheTest, LogStoreEntryEmpty) {
     const int kSize = 1024;
     scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(kSize));
     EXPECT_EQ(0, entry->GetDataSize(i));
-    EXPECT_EQ(0, entry->ReadData(i, 0, buf, kSize));
+    EXPECT_EQ(0, entry->ReadData(i, 0, buf.get(), kSize));
   }
   EXPECT_TRUE(entry->Close());
   ASSERT_TRUE(log_store.Close());
@@ -49,7 +49,7 @@ TEST_F(FlashCacheTest, LogStoreEntryWriteRead) {
   for (int i = 0; i < disk_cache::kFlashLogStoreEntryNumStreams; ++i) {
     buffers[i] = new net::IOBuffer(sizes[i]);
     CacheTestFillBuffer(buffers[i]->data(), sizes[i], false);
-    EXPECT_EQ(sizes[i], entry->WriteData(i, 0, buffers[i], sizes[i]));
+    EXPECT_EQ(sizes[i], entry->WriteData(i, 0, buffers[i].get(), sizes[i]));
   }
   EXPECT_TRUE(entry->Close());
 
@@ -60,7 +60,7 @@ TEST_F(FlashCacheTest, LogStoreEntryWriteRead) {
   for (int i = 0; i < disk_cache::kFlashLogStoreEntryNumStreams; ++i) {
     EXPECT_EQ(sizes[i], entry->GetDataSize(i));
     scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(sizes[i]));
-    EXPECT_EQ(sizes[i], entry->ReadData(i, 0, buffer, sizes[i]));
+    EXPECT_EQ(sizes[i], entry->ReadData(i, 0, buffer.get(), sizes[i]));
     EXPECT_EQ(0, memcmp(buffers[i]->data(), buffer->data(), sizes[i]));
   }
   EXPECT_TRUE(entry->Close());