5 files changed, 11 insertions, 10 deletions
diff --git a/content/test/content_browser_test_utils.cc b/content/test/content_browser_test_utils.cc
index 32d2597..1ac37da 100644
--- a/content/test/content_browser_test_utils.cc
+++ b/content/test/content_browser_test_utils.cc
@@ -84,7 +84,7 @@ Shell* ShellAddedObserver::GetShell() {
 void ShellAddedObserver::ShellCreated(Shell* shell) {
   DCHECK(!shell_);
   shell_ = shell;
-  if (runner_)
+  if (runner_.get())
     runner_->QuitClosure().Run();
 }
 
diff --git a/content/test/net/url_request_abort_on_end_job.cc b/content/test/net/url_request_abort_on_end_job.cc
index 2173887..4395c7e 100644
--- a/content/test/net/url_request_abort_on_end_job.cc
+++ b/content/test/net/url_request_abort_on_end_job.cc
@@ -83,7 +83,7 @@ void URLRequestAbortOnEndJob::GetResponseInfo(net::HttpResponseInfo* info) {
 bool URLRequestAbortOnEndJob::GetMimeType(std::string* mime_type) const {
   net::HttpResponseInfo info;
   GetResponseInfoConst(&info);
-  return info.headers && info.headers->GetMimeType(mime_type);
+  return info.headers.get() && info.headers->GetMimeType(mime_type);
 }
 
 void URLRequestAbortOnEndJob::StartAsync() {
diff --git a/content/test/net/url_request_mock_http_job.cc b/content/test/net/url_request_mock_http_job.cc
index f36cdf1..2c4ace5 100644
--- a/content/test/net/url_request_mock_http_job.cc
+++ b/content/test/net/url_request_mock_http_job.cc
@@ -150,14 +150,14 @@ void URLRequestMockHTTPJob::GetResponseInfoConst(
 bool URLRequestMockHTTPJob::GetMimeType(std::string* mime_type) const {
   net::HttpResponseInfo info;
   GetResponseInfoConst(&info);
-  return info.headers && info.headers->GetMimeType(mime_type);
+  return info.headers.get() && info.headers->GetMimeType(mime_type);
 }
 
 int URLRequestMockHTTPJob::GetResponseCode() const {
   net::HttpResponseInfo info;
   GetResponseInfoConst(&info);
   // If we have headers, get the response code from them.
-  if (info.headers)
+  if (info.headers.get())
     return info.headers->response_code();
   return net::URLRequestJob::GetResponseCode();
 }
@@ -165,7 +165,7 @@ int URLRequestMockHTTPJob::GetResponseCode() const {
 bool URLRequestMockHTTPJob::GetCharset(std::string* charset) {
   net::HttpResponseInfo info;
   GetResponseInfo(&info);
-  return info.headers && info.headers->GetCharset(charset);
+  return info.headers.get() && info.headers->GetCharset(charset);
 }
 
 }  // namespace content
diff --git a/content/test/net/url_request_slow_download_job.cc b/content/test/net/url_request_slow_download_job.cc
index 7b46136..7450670 100644
--- a/content/test/net/url_request_slow_download_job.cc
+++ b/content/test/net/url_request_slow_download_job.cc
@@ -203,9 +203,10 @@ bool URLRequestSlowDownloadJob::ReadRawData(net::IOBuffer* buf, int buf_size,
 void URLRequestSlowDownloadJob::CheckDoneStatus() {
   if (should_finish_download_) {
     VLOG(10) << __FUNCTION__ << " called w/ should_finish_download_ set.";
-    DCHECK(NULL != buffer_);
+    DCHECK(NULL != buffer_.get());
     int bytes_written = 0;
-    ReadStatus status = FillBufferHelper(buffer_, buffer_size_, &bytes_written);
+    ReadStatus status =
+        FillBufferHelper(buffer_.get(), buffer_size_, &bytes_written);
     DCHECK_EQ(BUFFER_FILLED, status);
     buffer_ = NULL;                     // Release the reference.
     SetStatus(net::URLRequestStatus());
@@ -267,7 +268,7 @@ void URLRequestSlowDownloadJob::GetResponseInfoConst(
 bool URLRequestSlowDownloadJob::GetMimeType(std::string* mime_type) const {
   net::HttpResponseInfo info;
   GetResponseInfoConst(&info);
-  return info.headers && info.headers->GetMimeType(mime_type);
+  return info.headers.get() && info.headers->GetMimeType(mime_type);
 }
 
 }  // namespace content
diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc
index 7bd5b30..f6c5dd8 100644
--- a/content/test/webrtc_audio_device_test.cc
+++ b/content/test/webrtc_audio_device_test.cc
@@ -285,13 +285,13 @@ bool WebRTCAudioDeviceTest::OnMessageReceived(const IPC::Message& message) {
       return true;
   }
 
-  if (audio_render_host_) {
+  if (audio_render_host_.get()) {
     bool message_was_ok = false;
     if (audio_render_host_->OnMessageReceived(message, &message_was_ok))
       return true;
   }
 
-  if (audio_input_renderer_host_) {
+  if (audio_input_renderer_host_.get()) {
     bool message_was_ok = false;
     if (audio_input_renderer_host_->OnMessageReceived(message, &message_was_ok))
       return true;