6 files changed, 16 insertions, 15 deletions
diff --git a/content/browser/streams/stream.cc b/content/browser/streams/stream.cc
index 8a926a6..1c6c956 100644
--- a/content/browser/streams/stream.cc
+++ b/content/browser/streams/stream.cc
@@ -87,7 +87,7 @@ Stream::StreamState Stream::ReadRawData(net::IOBuffer* buf,
                                         int buf_size,
                                         int* bytes_read) {
   *bytes_read = 0;
-  if (!data_) {
+  if (!data_.get()) {
     data_length_ = 0;
     data_bytes_read_ = 0;
     ByteStreamReader::StreamState state = reader_->Read(&data_, &data_length_);
diff --git a/content/browser/streams/stream_context.cc b/content/browser/streams/stream_context.cc
index ef3a79d..44ca0f4 100644
--- a/content/browser/streams/stream_context.cc
+++ b/content/browser/streams/stream_context.cc
@@ -22,7 +22,7 @@ StreamContext* StreamContext::GetFor(BrowserContext* context) {
   if (!context->GetUserData(kStreamContextKeyName)) {
     scoped_refptr<StreamContext> stream = new StreamContext();
     context->SetUserData(kStreamContextKeyName,
-                         new UserDataAdapter<StreamContext>(stream));
+                         new UserDataAdapter<StreamContext>(stream.get()));
     // Check first to avoid memory leak in unittests.
     if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
       BrowserThread::PostTask(
diff --git a/content/browser/streams/stream_registry.cc b/content/browser/streams/stream_registry.cc
index 7159831..39d24b3 100644
--- a/content/browser/streams/stream_registry.cc
+++ b/content/browser/streams/stream_registry.cc
@@ -16,7 +16,7 @@ StreamRegistry::~StreamRegistry() {
 
 void StreamRegistry::RegisterStream(scoped_refptr<Stream> stream) {
   DCHECK(CalledOnValidThread());
-  DCHECK(stream);
+  DCHECK(stream.get());
   DCHECK(!stream->url().is_empty());
   streams_[stream->url()] = stream;
 }
@@ -33,7 +33,7 @@ scoped_refptr<Stream> StreamRegistry::GetStream(const GURL& url) {
 bool StreamRegistry::CloneStream(const GURL& url, const GURL& src_url) {
   DCHECK(CalledOnValidThread());
   scoped_refptr<Stream> stream(GetStream(src_url));
-  if (stream) {
+  if (stream.get()) {
     streams_[url] = stream;
     return true;
   }
diff --git a/content/browser/streams/stream_unittest.cc b/content/browser/streams/stream_unittest.cc
index 3452553..e56f7aa 100644
--- a/content/browser/streams/stream_unittest.cc
+++ b/content/browser/streams/stream_unittest.cc
@@ -50,7 +50,7 @@ class TestStreamReader : public StreamReadObserver {
     scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kBufferSize));
 
     int bytes_read = 0;
-    while (stream->ReadRawData(buffer, kBufferSize, &bytes_read) ==
+    while (stream->ReadRawData(buffer.get(), kBufferSize, &bytes_read) ==
            Stream::STREAM_HAS_DATA) {
       size_t old_capacity = buffer_->capacity();
       buffer_->SetCapacity(old_capacity + bytes_read);
@@ -135,9 +135,9 @@ TEST_F(StreamTest, Stream) {
 
   const int kBufferSize = 1000000;
   scoped_refptr<net::IOBuffer> buffer(NewIOBuffer(kBufferSize));
-  writer.Write(stream, buffer, kBufferSize);
+  writer.Write(stream.get(), buffer, kBufferSize);
   stream->Finalize();
-  reader.Read(stream);
+  reader.Read(stream.get());
   base::MessageLoop::current()->RunUntilIdle();
 
   ASSERT_EQ(reader.buffer()->capacity(), kBufferSize);
@@ -165,7 +165,7 @@ TEST_F(StreamTest, GetStream_Missing) {
 
   GURL url2("blob://stream2");
   scoped_refptr<Stream> stream2 = registry_->GetStream(url2);
-  ASSERT_FALSE(stream2);
+  ASSERT_FALSE(stream2.get());
 }
 
 TEST_F(StreamTest, CloneStream) {
@@ -192,7 +192,7 @@ TEST_F(StreamTest, CloneStream_Missing) {
   GURL url3("blob://stream3");
   ASSERT_FALSE(registry_->CloneStream(url2, url3));
   scoped_refptr<Stream> stream2 = registry_->GetStream(url2);
-  ASSERT_FALSE(stream2);
+  ASSERT_FALSE(stream2.get());
 }
 
 TEST_F(StreamTest, UnregisterStream) {
@@ -204,7 +204,7 @@ TEST_F(StreamTest, UnregisterStream) {
 
   registry_->UnregisterStream(url);
   scoped_refptr<Stream> stream2 = registry_->GetStream(url);
-  ASSERT_FALSE(stream2);
+  ASSERT_FALSE(stream2.get());
 }
 
 }  // namespace content
diff --git a/content/browser/streams/stream_url_request_job.cc b/content/browser/streams/stream_url_request_job.cc
index 4478d16..a497667 100644
--- a/content/browser/streams/stream_url_request_job.cc
+++ b/content/browser/streams/stream_url_request_job.cc
@@ -44,7 +44,7 @@ StreamURLRequestJob::StreamURLRequestJob(
       total_bytes_read_(0),
       max_range_(0),
       request_failed_(false) {
-  DCHECK(stream_);
+  DCHECK(stream_.get());
   stream_->SetReadObserver(this);
 }
 
@@ -55,9 +55,10 @@ StreamURLRequestJob::~StreamURLRequestJob() {
 void StreamURLRequestJob::OnDataAvailable(Stream* stream) {
   // Clear the IO_PENDING status.
   SetStatus(net::URLRequestStatus());
-  if (pending_buffer_) {
+  if (pending_buffer_.get()) {
     int bytes_read;
-    stream_->ReadRawData(pending_buffer_, pending_buffer_size_, &bytes_read);
+    stream_->ReadRawData(
+        pending_buffer_.get(), pending_buffer_size_, &bytes_read);
 
     // Clear the buffers before notifying the read is complete, so that it is
     // safe for the observer to read.
@@ -234,7 +235,7 @@ void StreamURLRequestJob::HeadersCompleted(int status_code,
 }
 
 void StreamURLRequestJob::ClearStream() {
-  if (stream_) {
+  if (stream_.get()) {
     stream_->RemoveReadObserver(this);
     stream_ = NULL;
   }
diff --git a/content/browser/streams/stream_url_request_job_unittest.cc b/content/browser/streams/stream_url_request_job_unittest.cc
index 37d9c4f..fd80259 100644
--- a/content/browser/streams/stream_url_request_job_unittest.cc
+++ b/content/browser/streams/stream_url_request_job_unittest.cc
@@ -40,7 +40,7 @@ class StreamURLRequestJobTest : public testing::Test {
         net::URLRequest* request,
         net::NetworkDelegate* network_delegate) const OVERRIDE {
       scoped_refptr<Stream> stream = registry_->GetStream(request->url());
-      if (stream)
+      if (stream.get())
         return new StreamURLRequestJob(request, network_delegate, stream);
       return NULL;
     }