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

Linux fixes

BUG=110610
TBR=darin

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

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

224 files changed, 1208 insertions, 1107 deletions

diff --git a/content/browser/appcache/appcache_dispatcher_host.cc b/content/browser/appcache/appcache_dispatcher_host.cc
index 90a5dc7..b68a73d 100644
--- a/content/browser/appcache/appcache_dispatcher_host.cc
+++ b/content/browser/appcache/appcache_dispatcher_host.cc
@@ -22,7 +22,7 @@ AppCacheDispatcherHost::AppCacheDispatcherHost(
 
 void AppCacheDispatcherHost::OnChannelConnected(int32 peer_pid) {
   BrowserMessageFilter::OnChannelConnected(peer_pid);
-  if (appcache_service_) {
+  if (appcache_service_.get()) {
     backend_impl_.Initialize(
         appcache_service_.get(), &frontend_proxy_, process_id_);
     get_status_callback_ =
@@ -69,7 +69,7 @@ void AppCacheDispatcherHost::BadMessageReceived() {
 }
 
 void AppCacheDispatcherHost::OnRegisterHost(int host_id) {
-  if (appcache_service_) {
+  if (appcache_service_.get()) {
     if (!backend_impl_.RegisterHost(host_id)) {
       BadMessageReceived();
     }
@@ -77,7 +77,7 @@ void AppCacheDispatcherHost::OnRegisterHost(int host_id) {
 }
 
 void AppCacheDispatcherHost::OnUnregisterHost(int host_id) {
-  if (appcache_service_) {
+  if (appcache_service_.get()) {
     if (!backend_impl_.UnregisterHost(host_id)) {
       BadMessageReceived();
     }
@@ -86,7 +86,7 @@ void AppCacheDispatcherHost::OnUnregisterHost(int host_id) {
 
 void AppCacheDispatcherHost::OnSetSpawningHostId(
     int host_id, int spawning_host_id) {
-  if (appcache_service_) {
+  if (appcache_service_.get()) {
     if (!backend_impl_.SetSpawningHostId(host_id, spawning_host_id))
       BadMessageReceived();
   }
@@ -96,8 +96,9 @@ void AppCacheDispatcherHost::OnSelectCache(
     int host_id, const GURL& document_url,
     int64 cache_document_was_loaded_from,
     const GURL& opt_manifest_url) {
-  if (appcache_service_) {
-    if (!backend_impl_.SelectCache(host_id, document_url,
+  if (appcache_service_.get()) {
+    if (!backend_impl_.SelectCache(host_id,
+                                   document_url,
                                    cache_document_was_loaded_from,
                                    opt_manifest_url)) {
       BadMessageReceived();
@@ -109,7 +110,7 @@ void AppCacheDispatcherHost::OnSelectCache(
 
 void AppCacheDispatcherHost::OnSelectCacheForWorker(
     int host_id, int parent_process_id, int parent_host_id) {
-  if (appcache_service_) {
+  if (appcache_service_.get()) {
     if (!backend_impl_.SelectCacheForWorker(
             host_id, parent_process_id, parent_host_id)) {
       BadMessageReceived();
@@ -121,7 +122,7 @@ void AppCacheDispatcherHost::OnSelectCacheForWorker(
 
 void AppCacheDispatcherHost::OnSelectCacheForSharedWorker(
     int host_id, int64 appcache_id) {
-  if (appcache_service_) {
+  if (appcache_service_.get()) {
     if (!backend_impl_.SelectCacheForSharedWorker(host_id, appcache_id))
       BadMessageReceived();
   } else {
@@ -132,9 +133,9 @@ void AppCacheDispatcherHost::OnSelectCacheForSharedWorker(
 void AppCacheDispatcherHost::OnMarkAsForeignEntry(
     int host_id, const GURL& document_url,
     int64 cache_document_was_loaded_from) {
-  if (appcache_service_) {
-    if (!backend_impl_.MarkAsForeignEntry(host_id, document_url,
-                                          cache_document_was_loaded_from)) {
+  if (appcache_service_.get()) {
+    if (!backend_impl_.MarkAsForeignEntry(
+            host_id, document_url, cache_document_was_loaded_from)) {
       BadMessageReceived();
     }
   }
@@ -142,7 +143,7 @@ void AppCacheDispatcherHost::OnMarkAsForeignEntry(
 
 void AppCacheDispatcherHost::OnGetResourceList(
     int host_id, std::vector<appcache::AppCacheResourceInfo>* params) {
-  if (appcache_service_)
+  if (appcache_service_.get())
     backend_impl_.GetResourceList(host_id, params);
 }
 
@@ -154,9 +155,9 @@ void AppCacheDispatcherHost::OnGetStatus(int host_id, IPC::Message* reply_msg) {
   }
 
   pending_reply_msg_.reset(reply_msg);
-  if (appcache_service_) {
-    if (!backend_impl_.GetStatusWithCallback(host_id, get_status_callback_,
-                                             reply_msg)) {
+  if (appcache_service_.get()) {
+    if (!backend_impl_.GetStatusWithCallback(
+            host_id, get_status_callback_, reply_msg)) {
       BadMessageReceived();
     }
     return;
@@ -174,9 +175,9 @@ void AppCacheDispatcherHost::OnStartUpdate(int host_id,
   }
 
   pending_reply_msg_.reset(reply_msg);
-  if (appcache_service_) {
-    if (!backend_impl_.StartUpdateWithCallback(host_id, start_update_callback_,
-                                               reply_msg)) {
+  if (appcache_service_.get()) {
+    if (!backend_impl_.StartUpdateWithCallback(
+            host_id, start_update_callback_, reply_msg)) {
       BadMessageReceived();
     }
     return;
@@ -193,9 +194,9 @@ void AppCacheDispatcherHost::OnSwapCache(int host_id, IPC::Message* reply_msg) {
   }
 
   pending_reply_msg_.reset(reply_msg);
-  if (appcache_service_) {
-    if (!backend_impl_.SwapCacheWithCallback(host_id, swap_cache_callback_,
-                                             reply_msg)) {
+  if (appcache_service_.get()) {
+    if (!backend_impl_.SwapCacheWithCallback(
+            host_id, swap_cache_callback_, reply_msg)) {
       BadMessageReceived();
     }
     return;
diff --git a/content/browser/appcache/chrome_appcache_service.cc b/content/browser/appcache/chrome_appcache_service.cc
index d865070..1477b97 100644
--- a/content/browser/appcache/chrome_appcache_service.cc
+++ b/content/browser/appcache/chrome_appcache_service.cc
@@ -46,7 +46,7 @@ void ChromeAppCacheService::InitializeOnIOThread(
           BrowserThread::FILE_USER_BLOCKING),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
   set_appcache_policy(this);
-  set_special_storage_policy(special_storage_policy);
+  set_special_storage_policy(special_storage_policy.get());
 }
 
 bool ChromeAppCacheService::CanLoadAppCache(const GURL& manifest_url,
diff --git a/content/browser/appcache/chrome_appcache_service_unittest.cc b/content/browser/appcache/chrome_appcache_service_unittest.cc
index 42e1f1e..d61ff01 100644
--- a/content/browser/appcache/chrome_appcache_service_unittest.cc
+++ b/content/browser/appcache/chrome_appcache_service_unittest.cc
@@ -154,7 +154,7 @@ TEST_F(ChromeAppCacheServiceTest, KeepOnDestruction) {
       CreateAppCacheService(appcache_path, true);
   ASSERT_TRUE(file_util::PathExists(appcache_path));
   ASSERT_TRUE(file_util::PathExists(appcache_path.AppendASCII("Index")));
-  InsertDataIntoAppCache(appcache_service);
+  InsertDataIntoAppCache(appcache_service.get());
 
   // Test: delete the ChromeAppCacheService
   appcache_service = NULL;
@@ -169,7 +169,7 @@ TEST_F(ChromeAppCacheServiceTest, KeepOnDestruction) {
   // The appcache data is also there, except the session-only origin.
   AppCacheTestHelper appcache_helper;
   std::set<GURL> origins;
-  appcache_helper.GetOriginsWithCaches(appcache_service, &origins);
+  appcache_helper.GetOriginsWithCaches(appcache_service.get(), &origins);
   EXPECT_EQ(2UL, origins.size());
   EXPECT_TRUE(origins.find(kProtectedManifestURL.GetOrigin()) != origins.end());
   EXPECT_TRUE(origins.find(kNormalManifestURL.GetOrigin()) != origins.end());
@@ -191,7 +191,7 @@ TEST_F(ChromeAppCacheServiceTest, SaveSessionState) {
       CreateAppCacheService(appcache_path, true);
   ASSERT_TRUE(file_util::PathExists(appcache_path));
   ASSERT_TRUE(file_util::PathExists(appcache_path.AppendASCII("Index")));
-  InsertDataIntoAppCache(appcache_service);
+  InsertDataIntoAppCache(appcache_service.get());
 
   // Save session state. This should bypass the destruction-time deletion.
   appcache_service->set_force_keep_session_state();
@@ -209,7 +209,7 @@ TEST_F(ChromeAppCacheServiceTest, SaveSessionState) {
   // No appcache data was deleted.
   AppCacheTestHelper appcache_helper;
   std::set<GURL> origins;
-  appcache_helper.GetOriginsWithCaches(appcache_service, &origins);
+  appcache_helper.GetOriginsWithCaches(appcache_service.get(), &origins);
   EXPECT_EQ(3UL, origins.size());
   EXPECT_TRUE(origins.find(kProtectedManifestURL.GetOrigin()) != origins.end());
   EXPECT_TRUE(origins.find(kNormalManifestURL.GetOrigin()) != origins.end());
diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
index 176041e..ff4cb1e 100644
--- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
+++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
@@ -113,7 +113,7 @@ class TestBrowserPluginHostFactory : public BrowserPluginHostFactory {
   virtual BrowserPluginGuestManager*
       CreateBrowserPluginGuestManager() OVERRIDE {
     guest_manager_instance_count_++;
-    if (message_loop_runner_)
+    if (message_loop_runner_.get())
       message_loop_runner_->Quit();
     return new TestBrowserPluginGuestManager();
   }
@@ -217,7 +217,7 @@ class RenderViewHostMessageObserver : public RenderViewHostObserver {
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
     if (message.type() == message_id_) {
       message_received_ = true;
-      if (message_loop_runner_)
+      if (message_loop_runner_.get())
         message_loop_runner_->Quit();
     }
     return false;
diff --git a/content/browser/browser_plugin/test_browser_plugin_embedder.cc b/content/browser/browser_plugin/test_browser_plugin_embedder.cc
index bae9943..a513d0f 100644
--- a/content/browser/browser_plugin/test_browser_plugin_embedder.cc
+++ b/content/browser/browser_plugin/test_browser_plugin_embedder.cc
@@ -21,7 +21,7 @@ TestBrowserPluginEmbedder::~TestBrowserPluginEmbedder() {
 void TestBrowserPluginEmbedder::GetRenderViewHostCallback(
     RenderViewHost* rvh, int x, int y) {
   last_rvh_at_position_response_ = rvh;
-  if (message_loop_runner_)
+  if (message_loop_runner_.get())
     message_loop_runner_->Quit();
 }
 
diff --git a/content/browser/browser_plugin/test_browser_plugin_guest.cc b/content/browser/browser_plugin/test_browser_plugin_guest.cc
index 5205752..5a8149f 100644
--- a/content/browser/browser_plugin/test_browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/test_browser_plugin_guest.cc
@@ -53,7 +53,7 @@ void TestBrowserPluginGuest::Observe(int type,
       bool visible = *Details<bool>(details).ptr();
       if (!visible) {
         was_hidden_observed_ = true;
-        if (was_hidden_message_loop_runner_)
+        if (was_hidden_message_loop_runner_.get())
           was_hidden_message_loop_runner_->Quit();
       }
       return;
@@ -72,10 +72,10 @@ void TestBrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) {
     last_view_size_observed_ = params.view_size;
     if (!expected_auto_view_size_.IsEmpty() &&
         expected_auto_view_size_ == params.view_size) {
-      if (auto_view_size_message_loop_runner_)
+      if (auto_view_size_message_loop_runner_.get())
         auto_view_size_message_loop_runner_->Quit();
     }
-    if (send_message_loop_runner_)
+    if (send_message_loop_runner_.get())
       send_message_loop_runner_->Quit();
   }
   BrowserPluginGuest::SendMessageToEmbedder(msg);
@@ -109,7 +109,7 @@ void TestBrowserPluginGuest::RenderViewGone(base::TerminationStatus status) {
   if (status != base::TERMINATION_STATUS_NORMAL_TERMINATION &&
       status != base::TERMINATION_STATUS_STILL_RUNNING)
     LOG(INFO) << "Guest crashed status: " << status;
-  if (crash_message_loop_runner_)
+  if (crash_message_loop_runner_.get())
     crash_message_loop_runner_->Quit();
   BrowserPluginGuest::RenderViewGone(status);
 }
@@ -122,7 +122,7 @@ void TestBrowserPluginGuest::OnHandleInputEvent(
                                          guest_window_rect,
                                          event);
   input_observed_ = true;
-  if (input_message_loop_runner_)
+  if (input_message_loop_runner_.get())
     input_message_loop_runner_->Quit();
 }
 
@@ -231,11 +231,11 @@ void TestBrowserPluginGuest::WaitForViewSize(const gfx::Size& view_size) {
 void TestBrowserPluginGuest::OnSetFocus(int instance_id, bool focused) {
   if (focused) {
     focus_observed_ = true;
-    if (focus_message_loop_runner_)
+    if (focus_message_loop_runner_.get())
       focus_message_loop_runner_->Quit();
   } else {
     blur_observed_ = true;
-    if (blur_message_loop_runner_)
+    if (blur_message_loop_runner_.get())
       blur_message_loop_runner_->Quit();
   }
   BrowserPluginGuest::OnSetFocus(instance_id, focused);
@@ -243,21 +243,21 @@ void TestBrowserPluginGuest::OnSetFocus(int instance_id, bool focused) {
 
 void TestBrowserPluginGuest::OnTakeFocus(bool reverse) {
   advance_focus_observed_ = true;
-  if (advance_focus_message_loop_runner_)
+  if (advance_focus_message_loop_runner_.get())
     advance_focus_message_loop_runner_->Quit();
   BrowserPluginGuest::OnTakeFocus(reverse);
 }
 
 void TestBrowserPluginGuest::OnReload(int instance_id) {
   reload_observed_ = true;
-  if (reload_message_loop_runner_)
+  if (reload_message_loop_runner_.get())
     reload_message_loop_runner_->Quit();
   BrowserPluginGuest::OnReload(instance_id);
 }
 
 void TestBrowserPluginGuest::OnStop(int instance_id) {
   stop_observed_ = true;
-  if (stop_message_loop_runner_)
+  if (stop_message_loop_runner_.get())
     stop_message_loop_runner_->Quit();
   BrowserPluginGuest::OnStop(instance_id);
 }
@@ -269,7 +269,7 @@ void TestBrowserPluginGuest::SetDamageBuffer(
 
   if (waiting_for_damage_buffer_with_size_ &&
       expected_damage_buffer_size_ == params.view_rect.size() &&
-      damage_buffer_message_loop_runner_) {
+      damage_buffer_message_loop_runner_.get()) {
     damage_buffer_message_loop_runner_->Quit();
     waiting_for_damage_buffer_with_size_ = false;
   }
@@ -281,7 +281,7 @@ void TestBrowserPluginGuest::DidStopLoading(
     RenderViewHost* render_view_host) {
   BrowserPluginGuest::DidStopLoading(render_view_host);
   load_stop_observed_ = true;
-  if (load_stop_message_loop_runner_)
+  if (load_stop_message_loop_runner_.get())
     load_stop_message_loop_runner_->Quit();
 }
 
diff --git a/content/browser/browser_plugin/test_browser_plugin_guest_manager.cc b/content/browser/browser_plugin/test_browser_plugin_guest_manager.cc
index 2d74288..7d0b5ac 100644
--- a/content/browser/browser_plugin/test_browser_plugin_guest_manager.cc
+++ b/content/browser/browser_plugin/test_browser_plugin_guest_manager.cc
@@ -19,7 +19,7 @@ void TestBrowserPluginGuestManager::AddGuest(
     int instance_id,
     WebContentsImpl* guest_web_contents) {
   BrowserPluginGuestManager::AddGuest(instance_id, guest_web_contents);
-  if (message_loop_runner_)
+  if (message_loop_runner_.get())
     message_loop_runner_->Quit();
 }
 
diff --git a/content/browser/browser_thread_impl.cc b/content/browser/browser_thread_impl.cc
index 07b99a3f..a04b935 100644
--- a/content/browser/browser_thread_impl.cc
+++ b/content/browser/browser_thread_impl.cc
@@ -339,7 +339,7 @@ bool BrowserThread::PostBlockingPoolSequencedTask(
 
 // static
 base::SequencedWorkerPool* BrowserThread::GetBlockingPool() {
-  return g_globals.Get().blocking_pool;
+  return g_globals.Get().blocking_pool.get();
 }
 
 // static
diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc
index d10ea20..c70f38b 100644
--- a/content/browser/browsing_instance.cc
+++ b/content/browser/browsing_instance.cc
@@ -45,8 +45,9 @@ SiteInstance* BrowsingInstance::GetSiteInstanceForURL(const GURL& url) {
 }
 
 void BrowsingInstance::RegisterSiteInstance(SiteInstance* site_instance) {
-  DCHECK(static_cast<SiteInstanceImpl*>(site_instance)->
-         browsing_instance_ == this);
+  DCHECK(static_cast<SiteInstanceImpl*>(site_instance)
+             ->browsing_instance_.get() ==
+         this);
   DCHECK(static_cast<SiteInstanceImpl*>(site_instance)->HasSite());
   std::string site = site_instance->GetSiteURL().possibly_invalid_spec();
 
@@ -63,8 +64,9 @@ void BrowsingInstance::RegisterSiteInstance(SiteInstance* site_instance) {
 }
 
 void BrowsingInstance::UnregisterSiteInstance(SiteInstance* site_instance) {
-  DCHECK(static_cast<SiteInstanceImpl*>(site_instance)->
-         browsing_instance_ == this);
+  DCHECK(static_cast<SiteInstanceImpl*>(site_instance)
+             ->browsing_instance_.get() ==
+         this);
   DCHECK(static_cast<SiteInstanceImpl*>(site_instance)->HasSite());
   std::string site = site_instance->GetSiteURL().possibly_invalid_spec();
 
diff --git a/content/browser/cert_store_impl.cc b/content/browser/cert_store_impl.cc
index 5a171f7..e7fc1d2 100644
--- a/content/browser/cert_store_impl.cc
+++ b/content/browser/cert_store_impl.cc
@@ -121,7 +121,7 @@ void CertStoreImpl::RemoveCertInternal(int cert_id) {
   CertMap::iterator cert_iter = id_to_cert_.find(cert_id);
   DCHECK(cert_iter != id_to_cert_.end());
 
-  ReverseCertMap::iterator id_iter = cert_to_id_.find(cert_iter->second);
+  ReverseCertMap::iterator id_iter = cert_to_id_.find(cert_iter->second.get());
   DCHECK(id_iter != cert_to_id_.end());
   cert_to_id_.erase(id_iter);
 
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index bde7f93..e497762 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -495,7 +495,7 @@ void ChildProcessLauncher::SetProcessBackgrounded(bool background) {
 
 void ChildProcessLauncher::SetTerminateChildOnShutdown(
   bool terminate_on_shutdown) {
-  if (context_)
+  if (context_.get())
     context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
 }
 
diff --git a/content/browser/device_orientation/device_orientation_browsertest.cc b/content/browser/device_orientation/device_orientation_browsertest.cc
index 7edfbc2..17d9446 100644
--- a/content/browser/device_orientation/device_orientation_browsertest.cc
+++ b/content/browser/device_orientation/device_orientation_browsertest.cc
@@ -58,8 +58,8 @@ IN_PROC_BROWSER_TEST_F(DeviceOrientationBrowserTest, BasicTest) {
   test_orientation->set_beta(2);
   test_orientation->set_gamma(3);
   test_orientation->set_absolute(true);
-  scoped_refptr<MockProvider> provider(new MockProvider(
-    test_orientation, DeviceData::kTypeOrientation));
+  scoped_refptr<MockProvider> provider(
+      new MockProvider(test_orientation.get(), DeviceData::kTypeOrientation));
   Provider::SetInstanceForTests(provider.get());
 
   // The test page will register an event handler for orientation events,
diff --git a/content/browser/device_orientation/message_filter.cc b/content/browser/device_orientation/message_filter.cc
index f10ee08..2843f7d 100644
--- a/content/browser/device_orientation/message_filter.cc
+++ b/content/browser/device_orientation/message_filter.cc
@@ -22,11 +22,11 @@ DeviceOrientationMessageFilter::~DeviceOrientationMessageFilter() {
 void DeviceOrientationMessageFilter::OnStartUpdating(int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  if (!provider_)
+  if (!provider_.get())
     provider_ = Provider::GetInstance();
 
-  observers_map_[render_view_id] = new ObserverDelegate(device_data_type_,
-      provider_, render_view_id, this);
+  observers_map_[render_view_id] = new ObserverDelegate(
+      device_data_type_, provider_.get(), render_view_id, this);
 }
 
 void DeviceOrientationMessageFilter::OnStopUpdating(int render_view_id) {
diff --git a/content/browser/device_orientation/observer_delegate.cc b/content/browser/device_orientation/observer_delegate.cc
index fc4273f..1ffe07a 100644
--- a/content/browser/device_orientation/observer_delegate.cc
+++ b/content/browser/device_orientation/observer_delegate.cc
@@ -29,7 +29,7 @@ ObserverDelegate::~ObserverDelegate() {
 void ObserverDelegate::OnDeviceDataUpdate(
     const DeviceData* device_data, DeviceData::Type device_data_type) {
   scoped_refptr<const DeviceData> new_device_data(device_data);
-  if (!new_device_data)
+  if (!new_device_data.get())
     new_device_data = EmptyDeviceData(device_data_type);
 
   sender_->Send(new_device_data->CreateIPCMessage(render_view_id_));
diff --git a/content/browser/device_orientation/provider_impl.cc b/content/browser/device_orientation/provider_impl.cc
index 59bdebf..25e9bfd 100644
--- a/content/browser/device_orientation/provider_impl.cc
+++ b/content/browser/device_orientation/provider_impl.cc
@@ -89,7 +89,7 @@ void ProviderImpl::PollingThread::Initialize(DataFetcherFactory factory,
 
     if (fetcher) {
       scoped_refptr<const DeviceData> device_data(fetcher->GetDeviceData(type));
-      if (device_data != NULL) {
+      if (device_data.get() != NULL) {
         // Pass ownership of fetcher to provider_.
         data_fetcher_.swap(fetcher);
         last_device_data_map_[type] = device_data;
@@ -129,13 +129,13 @@ void ProviderImpl::PollingThread::DoPoll() {
     scoped_refptr<const DeviceData> device_data(data_fetcher_->GetDeviceData(
         device_data_type));
 
-    if (device_data == NULL) {
+    if (device_data.get() == NULL) {
       LOG(ERROR) << "Failed to poll device data fetcher.";
       ScheduleDoNotify(NULL, device_data_type);
       continue;
     }
 
-    const DeviceData* old_data = last_device_data_map_[device_data_type];
+    const DeviceData* old_data = last_device_data_map_[device_data_type].get();
     if (old_data != NULL && !device_data->ShouldFireEvent(old_data))
       continue;
 
@@ -197,7 +197,7 @@ void ProviderImpl::AddObserver(Observer* observer) {
     Start(type);
   else {
     // Notify observer of most recent notification if one exists.
-    const DeviceData *last_notification = last_notifications_map_[type];
+    const DeviceData* last_notification = last_notifications_map_[type].get();
     if (last_notification != NULL)
       observer->OnDeviceDataUpdate(last_notification, type);
   }
@@ -273,7 +273,7 @@ void ProviderImpl::DoNotify(const scoped_refptr<const DeviceData>& data,
       (*i)->OnDeviceDataUpdate(data.get(), device_data_type);
   }
 
-  if (data == NULL) {
+  if (data.get() == NULL) {
     // Notify observers exactly once about failure to provide data.
     typedef std::set<Observer*>::iterator Iterator;
     Iterator i = observers_.begin();
diff --git a/content/browser/device_orientation/provider_unittest.cc b/content/browser/device_orientation/provider_unittest.cc
index ee2beed..61cd168 100644
--- a/content/browser/device_orientation/provider_unittest.cc
+++ b/content/browser/device_orientation/provider_unittest.cc
@@ -87,7 +87,7 @@ class MotionUpdateChecker : public UpdateChecker {
     ASSERT_EQ(DeviceData::kTypeMotion, device_data_type);
 
     scoped_refptr<const Motion> motion(static_cast<const Motion*>(device_data));
-    if (motion == NULL)
+    if (motion.get() == NULL)
       motion = new Motion();
 
     scoped_refptr<const Motion> expected(static_cast<const Motion*>(
@@ -173,7 +173,7 @@ class OrientationUpdateChecker : public UpdateChecker {
 
     scoped_refptr<const Orientation> orientation(
         static_cast<const Orientation*>(device_data));
-    if (orientation == NULL)
+    if (orientation.get() == NULL)
       orientation = new Orientation();
 
     scoped_refptr<const Orientation> expected(static_cast<const Orientation*>(
@@ -218,7 +218,7 @@ class TestDataUpdateChecker : public UpdateChecker {
 
     scoped_refptr<const TestData> test_data(
         static_cast<const TestData*>(device_data));
-    if (test_data == NULL)
+    if (test_data.get() == NULL)
       test_data = new TestData();
 
     scoped_refptr<const TestData> expected(static_cast<const TestData*>(
@@ -287,7 +287,7 @@ class MockDeviceDataFactory
       base::AutoLock auto_lock(device_data_factory_->lock_);
       if (device_data_factory_->is_failing_)
         return NULL;
-      return device_data_factory_->device_data_map_[device_data_type];
+      return device_data_factory_->device_data_map_[device_data_type].get();
     }
 
    private:
@@ -322,7 +322,7 @@ class DeviceOrientationProviderTest : public testing::Test {
   // DataFetcherFactory factory.
   void Init(ProviderImpl::DataFetcherFactory factory) {
     provider_ = new ProviderImpl(factory);
-    Provider::SetInstanceForTests(provider_);
+    Provider::SetInstanceForTests(provider_.get());
   }
 
  protected:
@@ -384,9 +384,9 @@ TEST_F(DeviceOrientationProviderTest, BasicPushTest) {
 
   scoped_ptr<OrientationUpdateChecker> checker(
       new OrientationUpdateChecker(&pending_expectations_));
-  checker->AddExpectation(test_orientation);
-  device_data_factory->SetDeviceData(test_orientation,
-      DeviceData::kTypeOrientation);
+  checker->AddExpectation(test_orientation.get());
+  device_data_factory->SetDeviceData(test_orientation.get(),
+                                     DeviceData::kTypeOrientation);
   provider_->AddObserver(checker.get());
   base::MessageLoop::current()->Run();
 
@@ -425,26 +425,26 @@ TEST_F(DeviceOrientationProviderTest, MultipleObserversPushTest) {
   scoped_ptr<OrientationUpdateChecker> checker_c(
       new OrientationUpdateChecker(&pending_expectations_));
 
-  checker_a->AddExpectation(test_orientations[0]);
-  device_data_factory->SetDeviceData(test_orientations[0],
-      DeviceData::kTypeOrientation);
+  checker_a->AddExpectation(test_orientations[0].get());
+  device_data_factory->SetDeviceData(test_orientations[0].get(),
+                                     DeviceData::kTypeOrientation);
   provider_->AddObserver(checker_a.get());
   base::MessageLoop::current()->Run();
 
-  checker_a->AddExpectation(test_orientations[1]);
-  checker_b->AddExpectation(test_orientations[0]);
-  checker_b->AddExpectation(test_orientations[1]);
-  device_data_factory->SetDeviceData(test_orientations[1],
-      DeviceData::kTypeOrientation);
+  checker_a->AddExpectation(test_orientations[1].get());
+  checker_b->AddExpectation(test_orientations[0].get());
+  checker_b->AddExpectation(test_orientations[1].get());
+  device_data_factory->SetDeviceData(test_orientations[1].get(),
+                                     DeviceData::kTypeOrientation);
   provider_->AddObserver(checker_b.get());
   base::MessageLoop::current()->Run();
 
   provider_->RemoveObserver(checker_a.get());
-  checker_b->AddExpectation(test_orientations[2]);
-  checker_c->AddExpectation(test_orientations[1]);
-  checker_c->AddExpectation(test_orientations[2]);
-  device_data_factory->SetDeviceData(test_orientations[2],
-      DeviceData::kTypeOrientation);
+  checker_b->AddExpectation(test_orientations[2].get());
+  checker_c->AddExpectation(test_orientations[1].get());
+  checker_c->AddExpectation(test_orientations[2].get());
+  device_data_factory->SetDeviceData(test_orientations[2].get(),
+                                     DeviceData::kTypeOrientation);
   provider_->AddObserver(checker_c.get());
   base::MessageLoop::current()->Run();
 
@@ -477,9 +477,9 @@ TEST_F(DeviceOrientationProviderTest, FailingFirstDataTypeTest) {
   provider_->AddObserver(test_data_checker.get());
   base::MessageLoop::current()->Run();
 
-  orientation_checker->AddExpectation(test_orientation);
-  device_data_factory->SetDeviceData(test_orientation,
-      DeviceData::kTypeOrientation);
+  orientation_checker->AddExpectation(test_orientation.get());
+  device_data_factory->SetDeviceData(test_orientation.get(),
+                                     DeviceData::kTypeOrientation);
   provider_->AddObserver(orientation_checker.get());
   base::MessageLoop::current()->Run();
 
@@ -514,15 +514,15 @@ TEST_F(DeviceOrientationProviderTest, MAYBE_ObserverNotRemoved) {
 
   scoped_ptr<OrientationUpdateChecker> checker(
       new OrientationUpdateChecker(&pending_expectations_));
-  checker->AddExpectation(test_orientation);
-  device_data_factory->SetDeviceData(test_orientation,
-      DeviceData::kTypeOrientation);
+  checker->AddExpectation(test_orientation.get());
+  device_data_factory->SetDeviceData(test_orientation.get(),
+                                     DeviceData::kTypeOrientation);
   provider_->AddObserver(checker.get());
   base::MessageLoop::current()->Run();
 
-  checker->AddExpectation(test_orientation2);
-  device_data_factory->SetDeviceData(test_orientation2,
-      DeviceData::kTypeOrientation);
+  checker->AddExpectation(test_orientation2.get());
+  device_data_factory->SetDeviceData(test_orientation2.get(),
+                                     DeviceData::kTypeOrientation);
   base::MessageLoop::current()->Run();
 
   MockDeviceDataFactory::SetCurInstance(NULL);
@@ -552,9 +552,9 @@ TEST_F(DeviceOrientationProviderTest, MAYBE_StartFailing) {
   scoped_ptr<OrientationUpdateChecker> checker_b(new OrientationUpdateChecker(
       &pending_expectations_));
 
-  device_data_factory->SetDeviceData(test_orientation,
-      DeviceData::kTypeOrientation);
-  checker_a->AddExpectation(test_orientation);
+  device_data_factory->SetDeviceData(test_orientation.get(),
+                                     DeviceData::kTypeOrientation);
+  checker_a->AddExpectation(test_orientation.get());
   provider_->AddObserver(checker_a.get());
   base::MessageLoop::current()->Run();
 
@@ -594,17 +594,17 @@ TEST_F(DeviceOrientationProviderTest, StartStopStart) {
   scoped_ptr<OrientationUpdateChecker> checker_b(new OrientationUpdateChecker(
       &pending_expectations_));
 
-  checker_a->AddExpectation(test_orientation);
-  device_data_factory->SetDeviceData(test_orientation,
-      DeviceData::kTypeOrientation);
+  checker_a->AddExpectation(test_orientation.get());
+  device_data_factory->SetDeviceData(test_orientation.get(),
+                                     DeviceData::kTypeOrientation);
   provider_->AddObserver(checker_a.get());
   base::MessageLoop::current()->Run();
 
   provider_->RemoveObserver(checker_a.get()); // This stops the Provider.
 
-  checker_b->AddExpectation(test_orientation2);
-  device_data_factory->SetDeviceData(test_orientation2,
-      DeviceData::kTypeOrientation);
+  checker_b->AddExpectation(test_orientation2.get());
+  device_data_factory->SetDeviceData(test_orientation2.get(),
+                                     DeviceData::kTypeOrientation);
   provider_->AddObserver(checker_b.get());
   base::MessageLoop::current()->Run();
 
@@ -634,14 +634,16 @@ TEST_F(DeviceOrientationProviderTest, FLAKY_MotionAlwaysFires) {
   scoped_ptr<MotionUpdateChecker> checker(new MotionUpdateChecker(
       &pending_expectations_));
 
-  device_data_factory->SetDeviceData(test_motion, DeviceData::kTypeMotion);
-  checker->AddExpectation(test_motion);
+  device_data_factory->SetDeviceData(test_motion.get(),
+                                     DeviceData::kTypeMotion);
+  checker->AddExpectation(test_motion.get());
   provider_->AddObserver(checker.get());
   base::MessageLoop::current()->Run();
 
   // The observer should receive the same motion again.
-  device_data_factory->SetDeviceData(test_motion, DeviceData::kTypeMotion);
-  checker->AddExpectation(test_motion);
+  device_data_factory->SetDeviceData(test_motion.get(),
+                                     DeviceData::kTypeMotion);
+  checker->AddExpectation(test_motion.get());
   base::MessageLoop::current()->Run();
 
   provider_->RemoveObserver(checker.get());
@@ -684,23 +686,23 @@ TEST_F(DeviceOrientationProviderTest, OrientationSignificantlyDifferent) {
   scoped_ptr<OrientationUpdateChecker> checker_b(new OrientationUpdateChecker(
       &pending_expectations_));
 
-  device_data_factory->SetDeviceData(first_orientation,
-      DeviceData::kTypeOrientation);
-  checker_a->AddExpectation(first_orientation);
+  device_data_factory->SetDeviceData(first_orientation.get(),
+                                     DeviceData::kTypeOrientation);
+  checker_a->AddExpectation(first_orientation.get());
   provider_->AddObserver(checker_a.get());
   base::MessageLoop::current()->Run();
 
   // The observers should not see this insignificantly different orientation.
-  device_data_factory->SetDeviceData(second_orientation,
-      DeviceData::kTypeOrientation);
-  checker_b->AddExpectation(first_orientation);
+  device_data_factory->SetDeviceData(second_orientation.get(),
+                                     DeviceData::kTypeOrientation);
+  checker_b->AddExpectation(first_orientation.get());
   provider_->AddObserver(checker_b.get());
   base::MessageLoop::current()->Run();
 
-  device_data_factory->SetDeviceData(third_orientation,
-      DeviceData::kTypeOrientation);
-  checker_a->AddExpectation(third_orientation);
-  checker_b->AddExpectation(third_orientation);
+  device_data_factory->SetDeviceData(third_orientation.get(),
+                                     DeviceData::kTypeOrientation);
+  checker_a->AddExpectation(third_orientation.get());
+  checker_b->AddExpectation(third_orientation.get());
   base::MessageLoop::current()->Run();
 
   provider_->RemoveObserver(checker_a.get());
diff --git a/content/browser/devtools/devtools_external_agent_proxy_impl.cc b/content/browser/devtools/devtools_external_agent_proxy_impl.cc
index 5ecaa57..0513dc2 100644
--- a/content/browser/devtools/devtools_external_agent_proxy_impl.cc
+++ b/content/browser/devtools/devtools_external_agent_proxy_impl.cc
@@ -63,7 +63,7 @@ scoped_refptr<DevToolsAgentHost> DevToolsExternalAgentProxyImpl::
 void DevToolsExternalAgentProxyImpl::DispatchOnClientHost(
     const std::string& message) {
   DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(
-      agent_host_, message);
+      agent_host_.get(), message);
 }
 
 void DevToolsExternalAgentProxyImpl::ConnectionClosed() {
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc
index 89a40dd..11298134 100644
--- a/content/browser/devtools/devtools_http_handler_impl.cc
+++ b/content/browser/devtools/devtools_http_handler_impl.cc
@@ -641,10 +641,8 @@ void DevToolsHttpHandlerImpl::OnWebSocketRequestUI(
     return;
   }
 
-  DevToolsClientHostImpl* client_host =
-      new DevToolsClientHostImpl(thread_->message_loop(),
-                                 server_,
-                                 connection_id);
+  DevToolsClientHostImpl* client_host = new DevToolsClientHostImpl(
+      thread_->message_loop(), server_.get(), connection_id);
   connection_to_client_host_ui_[connection_id] = client_host;
 
   DevToolsManager::GetInstance()->
@@ -818,7 +816,7 @@ base::DictionaryValue* DevToolsHttpHandlerImpl::SerializePageInfo(
   scoped_refptr<DevToolsAgentHost> agent(
       DevToolsAgentHost::GetOrCreateFor(rvh));
 
-  std::string id = binding_->GetIdentifier(agent);
+  std::string id = binding_->GetIdentifier(agent.get());
   dictionary->SetString(kTargetIdField, id);
 
   switch (delegate_->GetTargetType(rvh)) {
@@ -860,7 +858,7 @@ base::DictionaryValue* DevToolsHttpHandlerImpl::SerializeWorkerInfo(
   scoped_refptr<DevToolsAgentHost> agent(DevToolsAgentHost::GetForWorker(
       worker.process_id, worker.route_id));
 
-  std::string id = binding_->GetIdentifier(agent);
+  std::string id = binding_->GetIdentifier(agent.get());
 
   dictionary->SetString(kTargetIdField, id);
   dictionary->SetString(kTargetTypeField, kTargetTypeOther);
diff --git a/content/browser/devtools/devtools_manager_impl.cc b/content/browser/devtools/devtools_manager_impl.cc
index 753340b..650b97b 100644
--- a/content/browser/devtools/devtools_manager_impl.cc
+++ b/content/browser/devtools/devtools_manager_impl.cc
@@ -49,7 +49,7 @@ DevToolsAgentHost* DevToolsManagerImpl::GetDevToolsAgentHostFor(
     DevToolsClientHost* client_host) {
   ClientToAgentHostMap::iterator it = client_to_agent_host_.find(client_host);
   if (it != client_to_agent_host_.end())
-    return it->second;
+    return it->second.get();
   return NULL;
 }
 
@@ -142,8 +142,7 @@ void DevToolsManagerImpl::UnbindClientHost(DevToolsAgentHostImpl* agent_host,
   scoped_refptr<DevToolsAgentHostImpl> protect(agent_host);
   DCHECK(agent_to_client_host_.find(agent_host)->second ==
       client_host);
-  DCHECK(client_to_agent_host_.find(client_host)->second ==
-      agent_host);
+  DCHECK(client_to_agent_host_.find(client_host)->second.get() == agent_host);
   agent_host->set_close_listener(NULL);
 
   agent_to_client_host_.erase(agent_host);
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
index 6923a93..944850d 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -136,7 +136,7 @@ TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
   EXPECT_FALSE(agent->IsAttached());
 
   TestDevToolsClientHost client_host;
-  manager->RegisterDevToolsClientHostFor(agent, &client_host);
+  manager->RegisterDevToolsClientHostFor(agent.get(), &client_host);
   // Test that the connection is established.
   EXPECT_TRUE(agent->IsAttached());
   EXPECT_EQ(agent, manager->GetDevToolsAgentHostFor(&client_host));
@@ -153,12 +153,12 @@ TEST_F(DevToolsManagerTest, ForwardMessageToClient) {
   TestDevToolsClientHost client_host;
   scoped_refptr<DevToolsAgentHost> agent_host(
       DevToolsAgentHost::GetOrCreateFor(rvh()));
-  manager->RegisterDevToolsClientHostFor(agent_host, &client_host);
+  manager->RegisterDevToolsClientHostFor(agent_host.get(), &client_host);
   EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
 
   std::string m = "test message";
   agent_host = DevToolsAgentHost::GetOrCreateFor(rvh());
-  manager->DispatchOnInspectorFrontend(agent_host, m);
+  manager->DispatchOnInspectorFrontend(agent_host.get(), m);
   EXPECT_TRUE(&m == client_host.last_sent_message);
 
   client_host.Close(manager);
@@ -175,8 +175,8 @@ TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedContents) {
   TestDevToolsClientHost client_host;
   scoped_refptr<DevToolsAgentHost> agent_host(
       DevToolsAgentHost::GetOrCreateFor(inspected_rvh));
-  DevToolsManager::GetInstance()->
-      RegisterDevToolsClientHostFor(agent_host, &client_host);
+  DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
+      agent_host.get(), &client_host);
 
   // Start with a short timeout.
   inspected_rvh->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
@@ -283,7 +283,7 @@ TEST_F(DevToolsManagerTest, TestExternalProxy) {
   DevToolsManager* manager = DevToolsManager::GetInstance();
 
   TestDevToolsClientHost client_host;
-  manager->RegisterDevToolsClientHostFor(agent_host, &client_host);
+  manager->RegisterDevToolsClientHostFor(agent_host.get(), &client_host);
 
   manager->DispatchOnInspectorBackend(&client_host, "message1");
   manager->DispatchOnInspectorBackend(&client_host, "message2");
diff --git a/content/browser/devtools/devtools_netlog_observer.cc b/content/browser/devtools/devtools_netlog_observer.cc
index 92390aa..cddceef 100644
--- a/content/browser/devtools/devtools_netlog_observer.cc
+++ b/content/browser/devtools/devtools_netlog_observer.cc
@@ -32,7 +32,7 @@ DevToolsNetLogObserver::ResourceInfo*
 DevToolsNetLogObserver::GetResourceInfo(uint32 id) {
   RequestToInfoMap::iterator it = request_to_info_.find(id);
   if (it != request_to_info_.end())
-    return it->second;
+    return it->second.get();
   return NULL;
 }
 
diff --git a/content/browser/devtools/tethering_handler.cc b/content/browser/devtools/tethering_handler.cc
index bad1ded..5c33231 100644
--- a/content/browser/devtools/tethering_handler.cc
+++ b/content/browser/devtools/tethering_handler.cc
@@ -52,7 +52,7 @@ class SocketPump : public net::StreamListenSocket::Delegate {
   std::string Init() {
     std::string channel_name;
     server_socket_ = delegate_->CreateSocketForTethering(this, &channel_name);
-    if (!server_socket_ || channel_name.empty())
+    if (!server_socket_.get() || channel_name.empty())
       SelfDestruct();
     return channel_name;
   }
@@ -62,7 +62,7 @@ class SocketPump : public net::StreamListenSocket::Delegate {
  private:
   virtual void DidAccept(net::StreamListenSocket* server,
                          net::StreamListenSocket* socket) OVERRIDE {
-    if (accepted_socket_)
+    if (accepted_socket_.get())
       return;
 
     buffer_ = new net::IOBuffer(kBufferSize);
@@ -70,9 +70,10 @@ class SocketPump : public net::StreamListenSocket::Delegate {
     wire_buffer_->SetCapacity(kBufferSize);
 
     accepted_socket_ = socket;
-    int result = client_socket_->Read(buffer_, kBufferSize,
-                                      base::Bind(&SocketPump::OnClientRead,
-                                                 base::Unretained(this)));
+    int result = client_socket_->Read(
+        buffer_.get(),
+        kBufferSize,
+        base::Bind(&SocketPump::OnClientRead, base::Unretained(this)));
     if (result != net::ERR_IO_PENDING)
       OnClientRead(result);
   }
@@ -101,9 +102,10 @@ class SocketPump : public net::StreamListenSocket::Delegate {
     }
 
     accepted_socket_->Send(buffer_->data(), result);
-    result = client_socket_->Read(buffer_, kBufferSize,
-                                  base::Bind(&SocketPump::OnClientRead,
-                                             base::Unretained(this)));
+    result = client_socket_->Read(
+        buffer_.get(),
+        kBufferSize,
+        base::Bind(&SocketPump::OnClientRead, base::Unretained(this)));
     if (result != net::ERR_IO_PENDING)
       OnClientRead(result);
   }
@@ -128,8 +130,9 @@ class SocketPump : public net::StreamListenSocket::Delegate {
     scoped_refptr<net::IOBuffer> buffer = new net::IOBuffer(remaining);
     memcpy(buffer->data(), wire_buffer_->data(), remaining);
     result = client_socket_->Write(
-        buffer, remaining, base::Bind(&SocketPump::OnClientWrite,
-                                      base::Unretained(this)));
+        buffer.get(),
+        remaining,
+        base::Bind(&SocketPump::OnClientWrite, base::Unretained(this)));
 
     // Shrink buffer
     int offset = wire_buffer_->offset();
diff --git a/content/browser/dom_storage/dom_storage_context_impl.cc b/content/browser/dom_storage/dom_storage_context_impl.cc
index 4c00467..58bb8f9 100644
--- a/content/browser/dom_storage/dom_storage_context_impl.cc
+++ b/content/browser/dom_storage/dom_storage_context_impl.cc
@@ -87,28 +87,30 @@ DOMStorageContextImpl::~DOMStorageContextImpl() {
 
 void DOMStorageContextImpl::GetLocalStorageUsage(
     const GetLocalStorageUsageCallback& callback) {
-  DCHECK(context_);
-  context_->task_runner()->PostShutdownBlockingTask(
-      FROM_HERE,
-      DomStorageTaskRunner::PRIMARY_SEQUENCE,
-      base::Bind(&GetLocalStorageUsageHelper,
-                 base::MessageLoopProxy::current(),
-                 context_, callback));
+  DCHECK(context_.get());
+  context_->task_runner()
+      ->PostShutdownBlockingTask(FROM_HERE,
+                                 DomStorageTaskRunner::PRIMARY_SEQUENCE,
+                                 base::Bind(&GetLocalStorageUsageHelper,
+                                            base::MessageLoopProxy::current(),
+                                            context_,
+                                            callback));
 }
 
 void DOMStorageContextImpl::GetSessionStorageUsage(
     const GetSessionStorageUsageCallback& callback) {
-  DCHECK(context_);
-  context_->task_runner()->PostShutdownBlockingTask(
-      FROM_HERE,
-      DomStorageTaskRunner::PRIMARY_SEQUENCE,
-      base::Bind(&GetSessionStorageUsageHelper,
-                 base::MessageLoopProxy::current(),
-                 context_, callback));
+  DCHECK(context_.get());
+  context_->task_runner()
+      ->PostShutdownBlockingTask(FROM_HERE,
+                                 DomStorageTaskRunner::PRIMARY_SEQUENCE,
+                                 base::Bind(&GetSessionStorageUsageHelper,
+                                            base::MessageLoopProxy::current(),
+                                            context_,
+                                            callback));
 }
 
 void DOMStorageContextImpl::DeleteLocalStorage(const GURL& origin) {
-  DCHECK(context_);
+  DCHECK(context_.get());
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
@@ -117,16 +119,16 @@ void DOMStorageContextImpl::DeleteLocalStorage(const GURL& origin) {
 
 void DOMStorageContextImpl::DeleteSessionStorage(
     const dom_storage::SessionStorageUsageInfo& usage_info) {
-  DCHECK(context_);
+  DCHECK(context_.get());
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
-      base::Bind(&DomStorageContext::DeleteSessionStorage, context_,
-                 usage_info));
+      base::Bind(
+          &DomStorageContext::DeleteSessionStorage, context_, usage_info));
 }
 
 void DOMStorageContextImpl::SetSaveSessionStorageOnDisk() {
-  DCHECK(context_);
+  DCHECK(context_.get());
   context_->SetSaveSessionStorageOnDisk();
 }
 
@@ -138,7 +140,7 @@ DOMStorageContextImpl::RecreateSessionStorage(
 }
 
 void DOMStorageContextImpl::StartScavengingUnusedSessionStorage() {
-  DCHECK(context_);
+  DCHECK(context_.get());
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
@@ -147,7 +149,7 @@ void DOMStorageContextImpl::StartScavengingUnusedSessionStorage() {
 }
 
 void DOMStorageContextImpl::PurgeMemory() {
-  DCHECK(context_);
+  DCHECK(context_.get());
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
@@ -155,7 +157,7 @@ void DOMStorageContextImpl::PurgeMemory() {
 }
 
 void DOMStorageContextImpl::SetForceKeepSessionState() {
-  DCHECK(context_);
+  DCHECK(context_.get());
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
@@ -163,7 +165,7 @@ void DOMStorageContextImpl::SetForceKeepSessionState() {
 }
 
 void DOMStorageContextImpl::Shutdown() {
-  DCHECK(context_);
+  DCHECK(context_.get());
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
diff --git a/content/browser/dom_storage/dom_storage_message_filter.cc b/content/browser/dom_storage/dom_storage_message_filter.cc
index c9b11f5..8df1bb8 100644
--- a/content/browser/dom_storage/dom_storage_message_filter.cc
+++ b/content/browser/dom_storage/dom_storage_message_filter.cc
@@ -32,7 +32,7 @@ DOMStorageMessageFilter::~DOMStorageMessageFilter() {
 
 void DOMStorageMessageFilter::InitializeInSequence() {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
-  host_.reset(new dom_storage::DomStorageHost(context_));
+  host_.reset(new dom_storage::DomStorageHost(context_.get()));
   context_->AddEventObserver(this);
 }
 
diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc
index b7cd416..1abd9c5 100644
--- a/content/browser/download/download_resource_handler.cc
+++ b/content/browser/download/download_resource_handler.cc
@@ -192,12 +192,12 @@ bool DownloadResourceHandler::OnResponseStarted(
   }
 
   std::string content_type_header;
-  if (!response->head.headers ||
+  if (!response->head.headers.get() ||
       !response->head.headers->GetMimeType(&content_type_header))
     content_type_header = "";
   info->original_mime_type = content_type_header;
 
-  if (!response->head.headers ||
+  if (!response->head.headers.get() ||
       !response->head.headers->EnumerateHeader(
           NULL, "Accept-Ranges", &accept_ranges_)) {
     accept_ranges_ = "";
@@ -243,7 +243,7 @@ bool DownloadResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf,
                                          int* buf_size, int min_size) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(buf && buf_size);
-  DCHECK(!read_buffer_);
+  DCHECK(!read_buffer_.get());
 
   *buf_size = min_size < 0 ? kReadBufSize : min_size;
   last_buffer_size_ = *buf_size;
@@ -256,7 +256,7 @@ bool DownloadResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf,
 bool DownloadResourceHandler::OnReadCompleted(int request_id, int bytes_read,
                                               bool* defer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(read_buffer_);
+  DCHECK(read_buffer_.get());
 
   base::TimeTicks now(base::TimeTicks::Now());
   if (!last_read_time_.is_null()) {
@@ -275,7 +275,7 @@ bool DownloadResourceHandler::OnReadCompleted(int request_id, int bytes_read,
   if (!bytes_read)
     return true;
   bytes_read_ += bytes_read;
-  DCHECK(read_buffer_);
+  DCHECK(read_buffer_.get());
 
   // Take the data ship it down the stream.  If the stream is full, pause the
   // request; the stream callback will resume it.
diff --git a/content/browser/download/drag_download_file.cc b/content/browser/download/drag_download_file.cc
index 3022ebd..c96ad97 100644
--- a/content/browser/download/drag_download_file.cc
+++ b/content/browser/download/drag_download_file.cc
@@ -189,7 +189,7 @@ void DragDownloadFile::Start(ui::DownloadFileObserver* observer) {
 
   DCHECK(!observer_.get());
   observer_ = observer;
-  DCHECK(observer_);
+  DCHECK(observer_.get());
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &DragDownloadFileUI::InitiateDownload, base::Unretained(drag_ui_),
diff --git a/content/browser/download/drag_download_file_browsertest.cc b/content/browser/download/drag_download_file_browsertest.cc
index 7242c84..2578b38 100644
--- a/content/browser/download/drag_download_file_browsertest.cc
+++ b/content/browser/download/drag_download_file_browsertest.cc
@@ -99,11 +99,11 @@ IN_PROC_BROWSER_TEST_F(DragDownloadFileTest, DragDownloadFileTest_NetError) {
       referrer_encoding, shell()->web_contents());
   scoped_refptr<MockDownloadFileObserver> observer(
       new MockDownloadFileObserver());
-  EXPECT_CALL(*observer, OnDownloadAborted()).WillOnce(InvokeWithoutArgs(
-      this, &DragDownloadFileTest::Succeed));
-  ON_CALL(*observer, OnDownloadCompleted(_)).WillByDefault(InvokeWithoutArgs(
-      this, &DragDownloadFileTest::FailFast));
-  file->Start(observer);
+  EXPECT_CALL(*observer.get(), OnDownloadAborted())
+      .WillOnce(InvokeWithoutArgs(this, &DragDownloadFileTest::Succeed));
+  ON_CALL(*observer.get(), OnDownloadCompleted(_))
+      .WillByDefault(InvokeWithoutArgs(this, &DragDownloadFileTest::FailFast));
+  file->Start(observer.get());
   RunMessageLoop();
 }
 
@@ -121,11 +121,11 @@ IN_PROC_BROWSER_TEST_F(DragDownloadFileTest, DragDownloadFileTest_Complete) {
       referrer_encoding, shell()->web_contents());
   scoped_refptr<MockDownloadFileObserver> observer(
       new MockDownloadFileObserver());
-  EXPECT_CALL(*observer, OnDownloadCompleted(_)).WillOnce(InvokeWithoutArgs(
-      this, &DragDownloadFileTest::Succeed));
-  ON_CALL(*observer, OnDownloadAborted()).WillByDefault(InvokeWithoutArgs(
-      this, &DragDownloadFileTest::FailFast));
-  file->Start(observer);
+  EXPECT_CALL(*observer.get(), OnDownloadCompleted(_))
+      .WillOnce(InvokeWithoutArgs(this, &DragDownloadFileTest::Succeed));
+  ON_CALL(*observer.get(), OnDownloadAborted())
+      .WillByDefault(InvokeWithoutArgs(this, &DragDownloadFileTest::FailFast));
+  file->Start(observer.get());
   RunMessageLoop();
 }
 
diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc
index c69829c..ea1c897 100644
--- a/content/browser/download/drag_download_util.cc
+++ b/content/browser/download/drag_download_util.cc
@@ -114,7 +114,7 @@ void PromiseFileFinalizer::OnDownloadAborted() {
 PromiseFileFinalizer::~PromiseFileFinalizer() {}
 
 void PromiseFileFinalizer::Cleanup() {
-  if (drag_file_downloader_)
+  if (drag_file_downloader_.get())
     drag_file_downloader_ = NULL;
 }
 
diff --git a/content/browser/download/save_file_resource_handler.cc b/content/browser/download/save_file_resource_handler.cc
index d611040..a12c6c5 100644
--- a/content/browser/download/save_file_resource_handler.cc
+++ b/content/browser/download/save_file_resource_handler.cc
@@ -76,7 +76,7 @@ bool SaveFileResourceHandler::OnWillStart(int request_id,
 bool SaveFileResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf,
                                          int* buf_size, int min_size) {
   DCHECK(buf && buf_size);
-  if (!read_buffer_) {
+  if (!read_buffer_.get()) {
     *buf_size = min_size < 0 ? kReadBufSize : min_size;
     read_buffer_ = new net::IOBuffer(*buf_size);
   }
@@ -86,7 +86,7 @@ bool SaveFileResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf,
 
 bool SaveFileResourceHandler::OnReadCompleted(int request_id, int bytes_read,
                                               bool* defer) {
-  DCHECK(read_buffer_);
+  DCHECK(read_buffer_.get());
   // We are passing ownership of this buffer to the save file manager.
   scoped_refptr<net::IOBuffer> buffer;
   read_buffer_.swap(buffer);
diff --git a/content/browser/fileapi/chrome_blob_storage_context.cc b/content/browser/fileapi/chrome_blob_storage_context.cc
index 6679e2c..728b0d5 100644
--- a/content/browser/fileapi/chrome_blob_storage_context.cc
+++ b/content/browser/fileapi/chrome_blob_storage_context.cc
@@ -23,8 +23,9 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
   if (!context->GetUserData(kBlobStorageContextKeyName)) {
     scoped_refptr<ChromeBlobStorageContext> blob =
         new ChromeBlobStorageContext();
-    context->SetUserData(kBlobStorageContextKeyName,
-                         new UserDataAdapter<ChromeBlobStorageContext>(blob));
+    context->SetUserData(
+        kBlobStorageContextKeyName,
+        new UserDataAdapter<ChromeBlobStorageContext>(blob.get()));
     // Check first to avoid memory leak in unittests.
     if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
       BrowserThread::PostTask(
diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc
index 47009c2..d9af761 100644
--- a/content/browser/fileapi/fileapi_message_filter.cc
+++ b/content/browser/fileapi/fileapi_message_filter.cc
@@ -70,7 +70,7 @@ FileAPIMessageFilter::FileAPIMessageFilter(
       request_context_(NULL),
       blob_storage_context_(blob_storage_context) {
   DCHECK(context_);
-  DCHECK(request_context_getter_);
+  DCHECK(request_context_getter_.get());
   DCHECK(blob_storage_context);
 }
 
@@ -91,7 +91,7 @@ FileAPIMessageFilter::FileAPIMessageFilter(
 void FileAPIMessageFilter::OnChannelConnected(int32 peer_pid) {
   BrowserMessageFilter::OnChannelConnected(peer_pid);
 
-  if (request_context_getter_) {
+  if (request_context_getter_.get()) {
     DCHECK(!request_context_);
     request_context_ = request_context_getter_->GetURLRequestContext();
     request_context_getter_ = NULL;
@@ -757,13 +757,13 @@ void FileAPIMessageFilter::DidCreateSnapshot(
     //   when the filesystem has been granted permissions. This happens with:
     //   - Drive filesystems
     //   - Picasa filesystems
-    DCHECK(snapshot_file ||
+    DCHECK(snapshot_file.get() ||
            fileapi::SandboxMountPointProvider::IsSandboxType(url.type()) ||
            url.type() == fileapi::kFileSystemTypeDrive ||
            url.type() == fileapi::kFileSystemTypePicasa);
     ChildProcessSecurityPolicyImpl::GetInstance()->GrantReadFile(
         process_id_, platform_path);
-    if (snapshot_file) {
+    if (snapshot_file.get()) {
       // This will revoke all permissions for the file when the last ref
       // of the file is dropped (assuming it's ok).
       snapshot_file->AddFinalReleaseCallback(
@@ -771,7 +771,7 @@ void FileAPIMessageFilter::DidCreateSnapshot(
     }
   }
 
-  if (snapshot_file) {
+  if (snapshot_file.get()) {
     // This ref is held until OnDidReceiveSnapshotFile is called.
     in_transit_snapshot_files_[request_id] = snapshot_file;
   }
diff --git a/content/browser/geolocation/device_data_provider.h b/content/browser/geolocation/device_data_provider.h
index 431d706..c35e256 100644
--- a/content/browser/geolocation/device_data_provider.h
+++ b/content/browser/geolocation/device_data_provider.h
@@ -253,11 +253,11 @@ class DeviceDataProvider : public base::NonThreadSafe {
   DeviceDataProvider() {
     DCHECK(factory_function_);
     impl_ = (*factory_function_)();
-    DCHECK(impl_);
+    DCHECK(impl_.get());
     impl_->SetContainer(this);
   }
   virtual ~DeviceDataProvider() {
-    DCHECK(impl_);
+    DCHECK(impl_.get());
     impl_->SetContainer(NULL);
   }
 
diff --git a/content/browser/geolocation/geolocation_dispatcher_host.cc b/content/browser/geolocation/geolocation_dispatcher_host.cc
index e718013..53f8e4f 100644
--- a/content/browser/geolocation/geolocation_dispatcher_host.cc
+++ b/content/browser/geolocation/geolocation_dispatcher_host.cc
@@ -143,11 +143,16 @@ void GeolocationDispatcherHostImpl::OnRequestPermission(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DVLOG(1) << __FUNCTION__ << " " << render_process_id_ << ":"
            << render_view_id << ":" << bridge_id;
-  if (geolocation_permission_context_) {
+  if (geolocation_permission_context_.get()) {
     geolocation_permission_context_->RequestGeolocationPermission(
-        render_process_id_, render_view_id, bridge_id, requesting_frame,
-        base::Bind(&SendGeolocationPermissionResponse, render_process_id_,
-                   render_view_id, bridge_id));
+        render_process_id_,
+        render_view_id,
+        bridge_id,
+        requesting_frame,
+        base::Bind(&SendGeolocationPermissionResponse,
+                   render_process_id_,
+                   render_view_id,
+                   bridge_id));
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
@@ -163,8 +168,8 @@ void GeolocationDispatcherHostImpl::OnCancelPermissionRequest(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DVLOG(1) << __FUNCTION__ << " " << render_process_id_ << ":"
            << render_view_id << ":" << bridge_id;
-  if (geolocation_permission_context_) {
-  geolocation_permission_context_->CancelGeolocationPermissionRequest(
+  if (geolocation_permission_context_.get()) {
+    geolocation_permission_context_->CancelGeolocationPermissionRequest(
         render_process_id_, render_view_id, bridge_id, requesting_frame);
   }
 }
diff --git a/content/browser/geolocation/location_arbitrator_impl.cc b/content/browser/geolocation/location_arbitrator_impl.cc
index 4fa19b5..8bc9a60 100644
--- a/content/browser/geolocation/location_arbitrator_impl.cc
+++ b/content/browser/geolocation/location_arbitrator_impl.cc
@@ -127,7 +127,7 @@ AccessTokenStore* GeolocationArbitratorImpl::NewAccessTokenStore() {
 }
 
 AccessTokenStore* GeolocationArbitratorImpl::GetAccessTokenStore() {
-  if (!access_token_store_)
+  if (!access_token_store_.get())
     access_token_store_ = NewAccessTokenStore();
   return access_token_store_.get();
 }
diff --git a/content/browser/geolocation/location_arbitrator_impl_unittest.cc b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
index 02b1b38..830f964 100644
--- a/content/browser/geolocation/location_arbitrator_impl_unittest.cc
+++ b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
@@ -153,7 +153,7 @@ class GeolocationLocationArbitratorTest : public testing::Test {
 };
 
 TEST_F(GeolocationLocationArbitratorTest, CreateDestroy) {
-  EXPECT_TRUE(access_token_store_);
+  EXPECT_TRUE(access_token_store_.get());
   EXPECT_TRUE(arbitrator_ != NULL);
   arbitrator_.reset();
   SUCCEED();
@@ -170,7 +170,7 @@ TEST_F(GeolocationLocationArbitratorTest, OnPermissionGranted) {
 }
 
 TEST_F(GeolocationLocationArbitratorTest, NormalUsage) {
-  ASSERT_TRUE(access_token_store_);
+  ASSERT_TRUE(access_token_store_.get());
   ASSERT_TRUE(arbitrator_ != NULL);
 
   EXPECT_FALSE(cell());
diff --git a/content/browser/geolocation/network_location_request.cc b/content/browser/geolocation/network_location_request.cc
index b4aac01..849381c 100644
--- a/content/browser/geolocation/network_location_request.cc
+++ b/content/browser/geolocation/network_location_request.cc
@@ -92,7 +92,7 @@ bool NetworkLocationRequest::MakeRequest(const string16& access_token,
   GURL request_url = FormRequestURL(url_);
   url_fetcher_.reset(net::URLFetcher::Create(
       url_fetcher_id_for_tests, request_url, net::URLFetcher::POST, this));
-  url_fetcher_->SetRequestContext(url_context_);
+  url_fetcher_->SetRequestContext(url_context_.get());
   std::string upload_data;
   FormUploadData(wifi_data, timestamp, access_token, &upload_data);
   url_fetcher_->SetUploadData("application/json", upload_data);
diff --git a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
index 718fb5d..9a1a99d 100644
--- a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
@@ -39,12 +39,11 @@ class GeolocationWifiDataProviderLinuxTest : public testing::Test {
     // Set an expectation so mock_network_manager_proxy_'s
     // CallMethodAndBlock() will use CreateNetworkManagerProxyResponse()
     // to return responses.
-    EXPECT_CALL(*mock_network_manager_proxy_,
+    EXPECT_CALL(*mock_network_manager_proxy_.get(),
                 MockCallMethodAndBlock(_, _))
-        .WillRepeatedly(Invoke(
-            this,
-            &GeolocationWifiDataProviderLinuxTest::
-            CreateNetworkManagerProxyResponse));
+        .WillRepeatedly(Invoke(this,
+                               &GeolocationWifiDataProviderLinuxTest::
+                                   CreateNetworkManagerProxyResponse));
 
     // Create a mock proxy that behaves as NetworkManager/Devices/0.
     mock_device_proxy_ =
@@ -52,11 +51,10 @@ class GeolocationWifiDataProviderLinuxTest : public testing::Test {
             mock_bus_.get(),
             "org.freedesktop.NetworkManager",
             dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0"));
-    EXPECT_CALL(*mock_device_proxy_,
-                MockCallMethodAndBlock(_, _))
+    EXPECT_CALL(*mock_device_proxy_.get(), MockCallMethodAndBlock(_, _))
         .WillRepeatedly(Invoke(
-            this,
-            &GeolocationWifiDataProviderLinuxTest::CreateDeviceProxyResponse));
+             this,
+             &GeolocationWifiDataProviderLinuxTest::CreateDeviceProxyResponse));
 
     // Create a mock proxy that behaves as NetworkManager/AccessPoint/0.
     mock_access_point_proxy_ =
@@ -64,34 +62,37 @@ class GeolocationWifiDataProviderLinuxTest : public testing::Test {
             mock_bus_.get(),
             "org.freedesktop.NetworkManager",
             dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0"));
-    EXPECT_CALL(*mock_access_point_proxy_,
-                MockCallMethodAndBlock(_, _))
-        .WillRepeatedly(Invoke(
-            this,
-            &GeolocationWifiDataProviderLinuxTest::
-            CreateAccessPointProxyResponse));
+    EXPECT_CALL(*mock_access_point_proxy_.get(), MockCallMethodAndBlock(_, _))
+        .WillRepeatedly(Invoke(this,
+                               &GeolocationWifiDataProviderLinuxTest::
+                                   CreateAccessPointProxyResponse));
 
     // Set an expectation so mock_bus_'s GetObjectProxy() for the given
     // service name and the object path will return
     // mock_network_manager_proxy_.
-    EXPECT_CALL(*mock_bus_, GetObjectProxy(
-        "org.freedesktop.NetworkManager",
-        dbus::ObjectPath("/org/freedesktop/NetworkManager")))
+    EXPECT_CALL(
+        *mock_bus_.get(),
+        GetObjectProxy("org.freedesktop.NetworkManager",
+                       dbus::ObjectPath("/org/freedesktop/NetworkManager")))
         .WillOnce(Return(mock_network_manager_proxy_.get()));
     // Likewise, set an expectation for mock_device_proxy_.
-    EXPECT_CALL(*mock_bus_, GetObjectProxy(
-        "org.freedesktop.NetworkManager",
-        dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0")))
+    EXPECT_CALL(
+        *mock_bus_.get(),
+        GetObjectProxy(
+            "org.freedesktop.NetworkManager",
+            dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0")))
         .WillOnce(Return(mock_device_proxy_.get()))
         .WillOnce(Return(mock_device_proxy_.get()));
     // Likewise, set an expectation for mock_access_point_proxy_.
-    EXPECT_CALL(*mock_bus_, GetObjectProxy(
-        "org.freedesktop.NetworkManager",
-        dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0")))
+    EXPECT_CALL(
+        *mock_bus_.get(),
+        GetObjectProxy(
+            "org.freedesktop.NetworkManager",
+            dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0")))
         .WillOnce(Return(mock_access_point_proxy_.get()));
 
     // ShutdownAndBlock() should be called.
-    EXPECT_CALL(*mock_bus_, ShutdownAndBlock()).WillOnce(Return());
+    EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return());
 
     // Create the wlan API with the mock bus object injected.
     wifi_provider_linux_ = new WifiDataProviderLinux;
diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc
index a5055b6..cda1c34 100644
--- a/content/browser/gpu/browser_gpu_channel_host_factory.cc
+++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc
@@ -251,7 +251,7 @@ void BrowserGpuChannelHostFactory::GpuChannelEstablishedOnIO(
 
 GpuChannelHost* BrowserGpuChannelHostFactory::EstablishGpuChannelSync(
     CauseForGpuLaunch cause_for_gpu_launch) {
-  if (gpu_channel_) {
+  if (gpu_channel_.get()) {
     // Recreate the channel if it has been lost.
     if (gpu_channel_->state() == GpuChannelHost::kLost)
       gpu_channel_ = NULL;
@@ -298,7 +298,7 @@ void BrowserGpuChannelHostFactory::AddFilterOnIO(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   GpuProcessHost* host = GpuProcessHost::FromID(host_id);
   if (host)
-    host->AddFilter(filter);
+    host->AddFilter(filter.get());
 }
 
 void BrowserGpuChannelHostFactory::SetHandlerForControlMessages(
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 323335e..078b8a2 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -1254,7 +1254,7 @@ void GpuProcessHost::CreateChannelCache(int32 client_id, size_t cache_size) {
 
   scoped_refptr<ShaderDiskCache> cache =
       ShaderCacheFactory::GetInstance()->Get(client_id);
-  if (!cache)
+  if (!cache.get())
     return;
 
   cache->set_max_cache_size(cache_size);
diff --git a/content/browser/gpu/shader_disk_cache.cc b/content/browser/gpu/shader_disk_cache.cc
index 4623208..48a76c5 100644
--- a/content/browser/gpu/shader_disk_cache.cc
+++ b/content/browser/gpu/shader_disk_cache.cc
@@ -218,10 +218,13 @@ int ShaderDiskCacheEntry::WriteCallback(int rv) {
 
   op_type_ = WRITE_DATA;
   scoped_refptr<net::StringIOBuffer> io_buf = new net::StringIOBuffer(shader_);
-  return entry_->WriteData(1, 0, io_buf, shader_.length(),
-                           base::Bind(&ShaderDiskCacheEntry::OnOpComplete,
-                                      this),
-                           false);
+  return entry_->WriteData(
+      1,
+      0,
+      io_buf.get(),
+      shader_.length(),
+      base::Bind(&ShaderDiskCacheEntry::OnOpComplete, this),
+      false);
 }
 
 int ShaderDiskCacheEntry::IOComplete(int rv) {
@@ -304,9 +307,12 @@ int ShaderDiskReadHelper::OpenNextEntryComplete(int rv) {
 
   op_type_ = READ_COMPLETE;
   buf_ = new net::IOBufferWithSize(entry_->GetDataSize(1));
-  return entry_->ReadData(1, 0, buf_, buf_->size(),
-                          base::Bind(&ShaderDiskReadHelper::OnOpComplete,
-                                     this));
+  return entry_->ReadData(
+      1,
+      0,
+      buf_.get(),
+      buf_->size(),
+      base::Bind(&ShaderDiskReadHelper::OnOpComplete, this));
 }
 
 int ShaderDiskReadHelper::ReadComplete(int rv) {
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
index 9908e31..f4f82c4 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
@@ -59,7 +59,7 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter {
   void FinishTransaction(int64 host_transaction_id, bool committed);
 
   // A shortcut for accessing our context.
-  IndexedDBContextImpl* Context() { return indexed_db_context_; }
+  IndexedDBContextImpl* Context() { return indexed_db_context_.get(); }
 
   // The various IndexedDBCallbacks children call these methods to add the
   // results into the applicable map.  See below for more details.
diff --git a/content/browser/indexed_db/indexed_db_context_impl.cc b/content/browser/indexed_db/indexed_db_context_impl.cc
index 0b61910..ea110bb 100644
--- a/content/browser/indexed_db/indexed_db_context_impl.cc
+++ b/content/browser/indexed_db/indexed_db_context_impl.cc
@@ -273,7 +273,7 @@ bool IndexedDBContextImpl::IsOverQuota(const GURL& origin_url) {
 }
 
 quota::QuotaManagerProxy* IndexedDBContextImpl::quota_manager_proxy() {
-  return quota_manager_proxy_;
+  return quota_manager_proxy_.get();
 }
 
 IndexedDBContextImpl::~IndexedDBContextImpl() {
diff --git a/content/browser/indexed_db/indexed_db_internals_ui.cc b/content/browser/indexed_db/indexed_db_internals_ui.cc
index 0f7bc3e..2ec1b5b 100644
--- a/content/browser/indexed_db/indexed_db_internals_ui.cc
+++ b/content/browser/indexed_db/indexed_db_internals_ui.cc
@@ -104,7 +104,7 @@ void IndexedDBInternalsUI::GetAllOriginsOnWebkitThread(
   for (ContextList::const_iterator iter = contexts->begin();
        iter != contexts->end();
        ++iter, ++path_iter) {
-    IndexedDBContext* context = *iter;
+    IndexedDBContext* context = iter->get();
     const base::FilePath& context_path = *path_iter;
 
     scoped_ptr<std::vector<IndexedDBInfo> > info_list(
@@ -174,7 +174,7 @@ void IndexedDBInternalsUI::DownloadOriginData(const base::ListValue* args) {
       &FindContext, partition_path, &result_partition, &result_context);
   BrowserContext::ForEachStoragePartition(browser_context, cb);
   DCHECK(result_partition);
-  DCHECK(result_context);
+  DCHECK(result_context.get());
 
   BrowserThread::PostTask(
       BrowserThread::WEBKIT_DEPRECATED,
diff --git a/content/browser/indexed_db/indexed_db_quota_client.cc b/content/browser/indexed_db/indexed_db_quota_client.cc
index bbce16c..befa158 100644
--- a/content/browser/indexed_db/indexed_db_quota_client.cc
+++ b/content/browser/indexed_db/indexed_db_quota_client.cc
@@ -87,7 +87,7 @@ void IndexedDBQuotaClient::GetOriginUsage(const GURL& origin_url,
   }
 
   base::PostTaskAndReplyWithResult(
-      webkit_thread_message_loop_,
+      webkit_thread_message_loop_.get(),
       FROM_HERE,
       base::Bind(
           &GetOriginUsageOnWebKitThread, indexed_db_context_, origin_url),
@@ -147,7 +147,7 @@ void IndexedDBQuotaClient::DeleteOriginData(const GURL& origin,
   }
 
   base::PostTaskAndReplyWithResult(
-      webkit_thread_message_loop_,
+      webkit_thread_message_loop_.get(),
       FROM_HERE,
       base::Bind(&DeleteOriginDataOnWebKitThread, indexed_db_context_, origin),
       callback);
diff --git a/content/browser/loader/async_resource_handler.cc b/content/browser/loader/async_resource_handler.cc
index 725ae5e..13b653f 100644
--- a/content/browser/loader/async_resource_handler.cc
+++ b/content/browser/loader/async_resource_handler.cc
@@ -173,8 +173,8 @@ bool AsyncResourceHandler::OnResponseStarted(int request_id,
 
   ResourceContext* resource_context = filter_->resource_context();
   if (rdh_->delegate()) {
-    rdh_->delegate()->OnResponseStarted(request_, resource_context, response,
-                                        filter_);
+    rdh_->delegate()->OnResponseStarted(
+        request_, resource_context, response, filter_.get());
   }
 
   DevToolsNetLogObserver::PopulateResponseInfo(request_, response);
@@ -198,10 +198,10 @@ bool AsyncResourceHandler::OnResponseStarted(int request_id,
       routing_id_, request_id, response->head));
   sent_received_response_msg_ = true;
 
-  if (request_->response_info().metadata) {
+  if (request_->response_info().metadata.get()) {
     std::vector<char> copy(request_->response_info().metadata->data(),
                            request_->response_info().metadata->data() +
-                           request_->response_info().metadata->size());
+                               request_->response_info().metadata->size());
     filter_->Send(new ResourceMsg_ReceivedCachedMetadata(
         routing_id_, request_id, copy));
   }
@@ -226,7 +226,7 @@ bool AsyncResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf,
   char* memory = buffer_->Allocate(&allocation_size_);
   CHECK(memory);
 
-  *buf = new DependentIOBuffer(buffer_, memory);
+  *buf = new DependentIOBuffer(buffer_.get(), memory);
   *buf_size = allocation_size_;
 
   UMA_HISTOGRAM_CUSTOM_COUNTS(
@@ -338,7 +338,7 @@ bool AsyncResourceHandler::OnResponseCompleted(
 }
 
 bool AsyncResourceHandler::EnsureResourceBufferIsInitialized() {
-  if (buffer_ && buffer_->IsInitialized())
+  if (buffer_.get() && buffer_->IsInitialized())
     return true;
 
   if (!has_checked_for_sufficient_resources_) {
diff --git a/content/browser/loader/buffered_resource_handler.cc b/content/browser/loader/buffered_resource_handler.cc
index c41c911..d7c115d 100644
--- a/content/browser/loader/buffered_resource_handler.cc
+++ b/content/browser/loader/buffered_resource_handler.cc
@@ -119,7 +119,7 @@ bool BufferedResourceHandler::OnResponseStarted(
   // responses end up being translated to 200 or whatever the cached response
   // code happens to be.  It should be very rare to see a 304 at this level.
 
-  if (!(response_->head.headers &&
+  if (!(response_->head.headers.get() &&
         response_->head.headers->response_code() == 304)) {
     if (ShouldSniffContent()) {
       state_ = STATE_BUFFERING;
@@ -153,9 +153,9 @@ bool BufferedResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf,
 
   DCHECK_EQ(-1, min_size);
 
-  if (read_buffer_) {
+  if (read_buffer_.get()) {
     CHECK_LT(bytes_read_, read_buffer_size_);
-    *buf = new DependentIOBuffer(read_buffer_, bytes_read_);
+    *buf = new DependentIOBuffer(read_buffer_.get(), bytes_read_);
     *buf_size = read_buffer_size_ - bytes_read_;
   } else {
     if (!next_handler_->OnWillRead(request_id, buf, buf_size, min_size))
@@ -229,7 +229,7 @@ bool BufferedResourceHandler::ProcessResponse(bool* defer) {
   DCHECK_EQ(STATE_PROCESSING, state_);
 
   // TODO(darin): Stop special-casing 304 responses.
-  if (!(response_->head.headers &&
+  if (!(response_->head.headers.get() &&
         response_->head.headers->response_code() == 304)) {
     if (!SelectNextHandler(defer))
       return false;
@@ -240,10 +240,10 @@ bool BufferedResourceHandler::ProcessResponse(bool* defer) {
   state_ = STATE_REPLAYING;
 
   int request_id = ResourceRequestInfo::ForRequest(request_)->GetRequestID();
-  if (!next_handler_->OnResponseStarted(request_id, response_, defer))
+  if (!next_handler_->OnResponseStarted(request_id, response_.get(), defer))
     return false;
 
-  if (!read_buffer_) {
+  if (!read_buffer_.get()) {
     state_ = STATE_STREAMING;
     return true;
   }
@@ -321,7 +321,7 @@ bool BufferedResourceHandler::SelectNextHandler(bool* defer) {
       return true;
 
     scoped_ptr<ResourceHandler> handler(
-        host_->MaybeInterceptAsStream(request_, response_));
+        host_->MaybeInterceptAsStream(request_, response_.get()));
     if (handler)
       return UseAlternateNextHandler(handler.Pass());
 
@@ -356,7 +356,7 @@ bool BufferedResourceHandler::SelectNextHandler(bool* defer) {
 
 bool BufferedResourceHandler::UseAlternateNextHandler(
     scoped_ptr<ResourceHandler> new_handler) {
-  if (response_->head.headers &&  // Can be NULL if FTP.
+  if (response_->head.headers.get() &&  // Can be NULL if FTP.
       response_->head.headers->response_code() / 100 != 2) {
     // The response code indicates that this is an error page, but we don't
     // know how to display the content.  We follow Firefox here and show our
@@ -373,7 +373,7 @@ bool BufferedResourceHandler::UseAlternateNextHandler(
   // the new ResourceHandler.
   // TODO(darin): We should probably check the return values of these.
   bool defer_ignored = false;
-  next_handler_->OnResponseStarted(request_id, response_, &defer_ignored);
+  next_handler_->OnResponseStarted(request_id, response_.get(), &defer_ignored);
   DCHECK(!defer_ignored);
   net::URLRequestStatus status(net::URLRequestStatus::CANCELED,
                                net::ERR_ABORTED);
@@ -388,7 +388,7 @@ bool BufferedResourceHandler::UseAlternateNextHandler(
 }
 
 bool BufferedResourceHandler::ReplayReadCompleted(bool* defer) {
-  DCHECK(read_buffer_);
+  DCHECK(read_buffer_.get());
 
   int request_id = ResourceRequestInfo::ForRequest(request_)->GetRequestID();
   bool result = next_handler_->OnReadCompleted(request_id, bytes_read_, defer);
diff --git a/content/browser/loader/certificate_resource_handler.cc b/content/browser/loader/certificate_resource_handler.cc
index 266b630..af3d075 100644
--- a/content/browser/loader/certificate_resource_handler.cc
+++ b/content/browser/loader/certificate_resource_handler.cc
@@ -68,7 +68,7 @@ bool CertificateResourceHandler::OnWillRead(int request_id,
 
   // TODO(gauravsh): Should we use 'min_size' here?
   DCHECK(buf && buf_size);
-  if (!read_buffer_) {
+  if (!read_buffer_.get()) {
     read_buffer_ = new net::IOBuffer(kReadBufSize);
   }
   *buf = read_buffer_.get();
@@ -84,7 +84,7 @@ bool CertificateResourceHandler::OnReadCompleted(int request_id,
     return true;
 
   // We have more data to read.
-  DCHECK(read_buffer_);
+  DCHECK(read_buffer_.get());
   content_length_ += bytes_read;
 
   // Release the ownership of the buffer, and store a reference
@@ -107,7 +107,7 @@ bool CertificateResourceHandler::OnResponseCompleted(
   AssembleResource();
 
   const void* content_bytes = NULL;
-  if (resource_buffer_)
+  if (resource_buffer_.get())
     content_bytes = resource_buffer_->data();
 
   // Note that it's up to the browser to verify that the certificate
@@ -132,7 +132,7 @@ void CertificateResourceHandler::AssembleResource() {
   // Copy the data into it.
   size_t bytes_copied = 0;
   for (size_t i = 0; i < buffer_.size(); ++i) {
-    net::IOBuffer* data = buffer_[i].first;
+    net::IOBuffer* data = buffer_[i].first.get();
     size_t data_len = buffer_[i].second;
     DCHECK(data != NULL);
     DCHECK_LE(bytes_copied + data_len, content_length_);
diff --git a/content/browser/loader/cross_site_resource_handler.cc b/content/browser/loader/cross_site_resource_handler.cc
index 40d8e0f..a6d1273 100644
--- a/content/browser/loader/cross_site_resource_handler.cc
+++ b/content/browser/loader/cross_site_resource_handler.cc
@@ -91,9 +91,8 @@ bool CrossSiteResourceHandler::OnResponseStarted(
   // In both cases, the pending RenderViewHost will stick around until the next
   // cross-site navigation, since we are unable to tell when to destroy it.
   // See RenderViewHostManager::RendererAbortedProvisionalLoad.
-  if (info->is_download() ||
-      (response->head.headers &&
-       response->head.headers->response_code() == 204)) {
+  if (info->is_download() || (response->head.headers.get() &&
+                              response->head.headers->response_code() == 204)) {
     return next_handler_->OnResponseStarted(request_id, response, defer);
   }
 
diff --git a/content/browser/loader/redirect_to_file_resource_handler.cc b/content/browser/loader/redirect_to_file_resource_handler.cc
index 12bd979..41168c5 100644
--- a/content/browser/loader/redirect_to_file_resource_handler.cc
+++ b/content/browser/loader/redirect_to_file_resource_handler.cc
@@ -79,7 +79,7 @@ bool RedirectToFileResourceHandler::OnResponseStarted(
     bool* defer) {
   if (response->head.error_code == net::OK ||
       response->head.error_code == net::ERR_IO_PENDING) {
-    DCHECK(deletable_file_ && !deletable_file_->path().empty());
+    DCHECK(deletable_file_.get() && !deletable_file_->path().empty());
     response->head.download_file_path = deletable_file_->path();
   }
   return next_handler_->OnResponseStarted(request_id, response, defer);
@@ -89,7 +89,7 @@ bool RedirectToFileResourceHandler::OnWillStart(int request_id,
                                                 const GURL& url,
                                                 bool* defer) {
   request_id_ = request_id;
-  if (!deletable_file_) {
+  if (!deletable_file_.get()) {
     // Defer starting the request until we have created the temporary file.
     // TODO(darin): This is sub-optimal.  We should not delay starting the
     // network request like this.
@@ -116,7 +116,7 @@ bool RedirectToFileResourceHandler::OnWillRead(int request_id,
   // We should have paused this network request already if the buffer is full.
   DCHECK(!BufIsFull());
 
-  *buf = buf_;
+  *buf = buf_.get();
   *buf_size = buf_->RemainingCapacity();
 
   buf_write_pending_ = true;
@@ -231,11 +231,11 @@ bool RedirectToFileResourceHandler::WriteMore() {
     // bowels of its implementation, the use of scoped_refptr here is not
     // spurious.
     scoped_refptr<DependentIOBuffer> wrapped = new DependentIOBuffer(
-        buf_, buf_->StartOfBuffer() + write_cursor_);
+        buf_.get(), buf_->StartOfBuffer() + write_cursor_);
     int write_len = buf_->offset() - write_cursor_;
 
     int rv = file_stream_->Write(
-        wrapped,
+        wrapped.get(),
         write_len,
         base::Bind(&RedirectToFileResourceHandler::DidWriteToFile,
                    base::Unretained(this)));
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index ee54f68..b1b13a4 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -182,7 +182,7 @@ bool ShouldServiceRequest(int process_type,
   }
 
   // Check if the renderer is permitted to upload the requested files.
-  if (request_data.request_body) {
+  if (request_data.request_body.get()) {
     const std::vector<ResourceRequestBody::Element>* uploads =
         request_data.request_body->elements();
     std::vector<ResourceRequestBody::Element>::const_iterator iter;
@@ -280,8 +280,8 @@ int BuildLoadFlagsForRequest(
 }
 
 int GetCertID(net::URLRequest* request, int child_id) {
-  if (request->ssl_info().cert) {
-    return CertStore::GetInstance()->StoreCert(request->ssl_info().cert,
+  if (request->ssl_info().cert.get()) {
+    return CertStore::GetInstance()->StoreCert(request->ssl_info().cert.get(),
                                                child_id);
   }
   return 0;
@@ -1017,7 +1017,7 @@ void ResourceDispatcherHostImpl::BeginRequest(
   request->SetPriority(request_data.priority);
 
   // Resolve elements from request_body and prepare upload data.
-  if (request_data.request_body) {
+  if (request_data.request_body.get()) {
     request->set_upload(make_scoped_ptr(
         request_data.request_body->ResolveElementsAndCreateUploadDataStream(
             filter_->blob_storage_context()->controller(),
diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h
index 87ac602..de2be0f 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.h
+++ b/content/browser/loader/resource_dispatcher_host_impl.h
@@ -154,7 +154,7 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
   static const int kAvgBytesPerOutstandingRequest = 4400;
 
   SaveFileManager* save_file_manager() const {
-    return save_file_manager_;
+    return save_file_manager_.get();
   }
 
   // Called when the unload handler for a cross-site request has finished.
diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc
index 73fa420..3c1acca 100644
--- a/content/browser/loader/resource_dispatcher_host_unittest.cc
+++ b/content/browser/loader/resource_dispatcher_host_unittest.cc
@@ -770,7 +770,7 @@ void ResourceDispatcherHostTest::CancelRequest(int request_id) {
 }
 
 void ResourceDispatcherHostTest::CompleteStartRequest(int request_id) {
-  CompleteStartRequest(filter_, request_id);
+  CompleteStartRequest(filter_.get(), request_id);
 }
 
 void ResourceDispatcherHostTest::CompleteStartRequest(
@@ -1749,7 +1749,8 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigation) {
   ResourceHostMsg_RequestResource transfer_request_msg(
       new_render_view_id, new_request_id, request);
   bool msg_was_ok;
-  host_.OnMessageReceived(transfer_request_msg, second_filter, &msg_was_ok);
+  host_.OnMessageReceived(
+      transfer_request_msg, second_filter.get(), &msg_was_ok);
   base::MessageLoop::current()->RunUntilIdle();
 
   // Flush all the pending requests.
@@ -1811,7 +1812,8 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationAndThenRedirect) {
   ResourceHostMsg_RequestResource transfer_request_msg(
       new_render_view_id, new_request_id, request);
   bool msg_was_ok;
-  host_.OnMessageReceived(transfer_request_msg, second_filter, &msg_was_ok);
+  host_.OnMessageReceived(
+      transfer_request_msg, second_filter.get(), &msg_was_ok);
   base::MessageLoop::current()->RunUntilIdle();
 
   // Response data for "http://other.com/blerg":
@@ -1822,7 +1824,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationAndThenRedirect) {
 
   // OK, let the redirect happen.
   SetDelayedStartJobGeneration(false);
-  CompleteStartRequest(second_filter, new_request_id);
+  CompleteStartRequest(second_filter.get(), new_request_id);
   base::MessageLoop::current()->RunUntilIdle();
 
   // Flush all the pending requests.
@@ -1831,7 +1833,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationAndThenRedirect) {
   // Now, simulate the renderer choosing to follow the redirect.
   ResourceHostMsg_FollowRedirect redirect_msg(
       new_render_view_id, new_request_id, false, GURL());
-  host_.OnMessageReceived(redirect_msg, second_filter, &msg_was_ok);
+  host_.OnMessageReceived(redirect_msg, second_filter.get(), &msg_was_ok);
   base::MessageLoop::current()->RunUntilIdle();
 
   // Flush all the pending requests.
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 6319512..a984b20 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -70,9 +70,9 @@ ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request,
 }
 
 ResourceLoader::~ResourceLoader() {
-  if (login_delegate_)
+  if (login_delegate_.get())
     login_delegate_->OnRequestCancelled();
-  if (ssl_client_auth_handler_)
+  if (ssl_client_auth_handler_.get())
     ssl_client_auth_handler_->OnRequestCancelled();
 
   // Run ResourceHandler destructor before we tear-down the rest of our state
@@ -250,10 +250,10 @@ void ResourceLoader::OnReceivedRedirect(net::URLRequest* unused,
   }
 
   scoped_refptr<ResourceResponse> response(new ResourceResponse());
-  PopulateResourceResponse(request_.get(), response);
+  PopulateResourceResponse(request_.get(), response.get());
 
-  if (!handler_->OnRequestRedirected(info->GetRequestID(), new_url, response,
-                                     defer)) {
+  if (!handler_->OnRequestRedirected(
+          info->GetRequestID(), new_url, response.get(), defer)) {
     Cancel();
   } else if (*defer) {
     deferred_stage_ = DEFERRED_REDIRECT;  // Follow redirect when resumed.
@@ -277,10 +277,10 @@ void ResourceLoader::OnAuthRequired(net::URLRequest* unused,
   // Create a login dialog on the UI thread to get authentication data, or pull
   // from cache and continue on the IO thread.
 
-  DCHECK(!login_delegate_) <<
-      "OnAuthRequired called with login_delegate pending";
+  DCHECK(!login_delegate_.get())
+      << "OnAuthRequired called with login_delegate pending";
   login_delegate_ = delegate_->CreateLoginDelegate(this, auth_info);
-  if (!login_delegate_)
+  if (!login_delegate_.get())
     request_->CancelAuth();
 }
 
@@ -303,8 +303,8 @@ void ResourceLoader::OnCertificateRequested(
   }
 #endif
 
-  DCHECK(!ssl_client_auth_handler_) <<
-      "OnCertificateRequested called with ssl_client_auth_handler pending";
+  DCHECK(!ssl_client_auth_handler_.get())
+      << "OnCertificateRequested called with ssl_client_auth_handler pending";
   ssl_client_auth_handler_ = new SSLClientAuthHandler(request_.get(),
                                                       cert_info);
   ssl_client_auth_handler_->SelectCertificate();
@@ -478,11 +478,11 @@ void ResourceLoader::CancelRequestInternal(int error, bool from_renderer) {
   // IO_PENDING?
   bool was_pending = request_->is_pending();
 
-  if (login_delegate_) {
+  if (login_delegate_.get()) {
     login_delegate_->OnRequestCancelled();
     login_delegate_ = NULL;
   }
-  if (ssl_client_auth_handler_) {
+  if (ssl_client_auth_handler_.get()) {
     ssl_client_auth_handler_->OnRequestCancelled();
     ssl_client_auth_handler_ = NULL;
   }
@@ -504,7 +504,7 @@ void ResourceLoader::CompleteResponseStarted() {
   ResourceRequestInfoImpl* info = GetRequestInfo();
 
   scoped_refptr<ResourceResponse> response(new ResourceResponse());
-  PopulateResourceResponse(request_.get(), response);
+  PopulateResourceResponse(request_.get(), response.get());
 
   // The --site-per-process flag enables an out-of-process iframes
   // prototype. It works by changing the MIME type of cross-site subframe
@@ -534,10 +534,9 @@ void ResourceLoader::CompleteResponseStarted() {
     response->head.mime_type = "application/browser-plugin";
   }
 
-  if (request_->ssl_info().cert) {
-    int cert_id =
-        CertStore::GetInstance()->StoreCert(request_->ssl_info().cert,
-                                            info->GetChildID());
+  if (request_->ssl_info().cert.get()) {
+    int cert_id = CertStore::GetInstance()->StoreCert(
+        request_->ssl_info().cert.get(), info->GetChildID());
     response->head.security_info = SerializeSecurityInfo(
         cert_id,
         request_->ssl_info().cert_status,
@@ -553,7 +552,8 @@ void ResourceLoader::CompleteResponseStarted() {
   delegate_->DidReceiveResponse(this);
 
   bool defer = false;
-  if (!handler_->OnResponseStarted(info->GetRequestID(), response, &defer)) {
+  if (!handler_->OnResponseStarted(
+          info->GetRequestID(), response.get(), &defer)) {
     Cancel();
   } else if (defer) {
     deferred_stage_ = DEFERRED_READ;  // Read first chunk when resumed.
@@ -632,8 +632,8 @@ void ResourceLoader::ResponseCompleted() {
 
   std::string security_info;
   const net::SSLInfo& ssl_info = request_->ssl_info();
-  if (ssl_info.cert != NULL) {
-    int cert_id = CertStore::GetInstance()->StoreCert(ssl_info.cert,
+  if (ssl_info.cert.get() != NULL) {
+    int cert_id = CertStore::GetInstance()->StoreCert(ssl_info.cert.get(),
                                                       info->GetChildID());
     security_info = SerializeSecurityInfo(
         cert_id, ssl_info.cert_status, ssl_info.security_bits,
diff --git a/content/browser/loader/resource_message_filter.h b/content/browser/loader/resource_message_filter.h
index eb7d0f9..0ea5771 100644
--- a/content/browser/loader/resource_message_filter.h
+++ b/content/browser/loader/resource_message_filter.h
@@ -63,15 +63,15 @@ class CONTENT_EXPORT ResourceMessageFilter : public BrowserMessageFilter {
   }
 
   ChromeAppCacheService* appcache_service() const {
-    return appcache_service_;
+    return appcache_service_.get();
   }
 
   ChromeBlobStorageContext* blob_storage_context() const {
-    return blob_storage_context_;
+    return blob_storage_context_.get();
   }
 
   fileapi::FileSystemContext* file_system_context() const {
-    return file_system_context_;
+    return file_system_context_.get();
   }
 
   // Returns the net::URLRequestContext for the given request.
diff --git a/content/browser/loader/stream_resource_handler.cc b/content/browser/loader/stream_resource_handler.cc
index 581b944..c832afa 100644
--- a/content/browser/loader/stream_resource_handler.cc
+++ b/content/browser/loader/stream_resource_handler.cc
@@ -63,7 +63,7 @@ bool StreamResourceHandler::OnWillRead(int request_id,
   static const int kReadBufSize = 32768;
 
   DCHECK(buf && buf_size);
-  if (!read_buffer_)
+  if (!read_buffer_.get())
     read_buffer_ = new net::IOBuffer(kReadBufSize);
   *buf = read_buffer_.get();
   *buf_size = kReadBufSize;
@@ -78,7 +78,7 @@ bool StreamResourceHandler::OnReadCompleted(int request_id,
     return true;
 
   // We have more data to read.
-  DCHECK(read_buffer_);
+  DCHECK(read_buffer_.get());
 
   // Release the ownership of the buffer, and store a reference
   // to it. A new one will be allocated in OnWillRead().
diff --git a/content/browser/loader/stream_resource_handler.h b/content/browser/loader/stream_resource_handler.h
index f6c94ae..0f18f01 100644
--- a/content/browser/loader/stream_resource_handler.h
+++ b/content/browser/loader/stream_resource_handler.h
@@ -63,7 +63,7 @@ class StreamResourceHandler : public StreamWriteObserver,
 
   virtual void OnDataDownloaded(int request_id, int bytes_downloaded) OVERRIDE;
 
-  Stream* stream() { return stream_; }
+  Stream* stream() { return stream_.get(); }
 
  private:
   virtual void OnSpaceAvailable(Stream* stream) OVERRIDE;
diff --git a/content/browser/loader/sync_resource_handler.cc b/content/browser/loader/sync_resource_handler.cc
index 879c267..1db8dca 100644
--- a/content/browser/loader/sync_resource_handler.cc
+++ b/content/browser/loader/sync_resource_handler.cc
@@ -70,8 +70,8 @@ bool SyncResourceHandler::OnResponseStarted(
     ResourceResponse* response,
     bool* defer) {
   if (rdh_->delegate()) {
-    rdh_->delegate()->OnResponseStarted(request_, filter_->resource_context(),
-                                        response, filter_);
+    rdh_->delegate()->OnResponseStarted(
+        request_, filter_->resource_context(), response, filter_.get());
   }
 
   DevToolsNetLogObserver::PopulateResponseInfo(request_, response);
diff --git a/content/browser/loader/throttling_resource_handler.cc b/content/browser/loader/throttling_resource_handler.cc
index 71bc176..5725e03 100644
--- a/content/browser/loader/throttling_resource_handler.cc
+++ b/content/browser/loader/throttling_resource_handler.cc
@@ -160,7 +160,7 @@ void ThrottlingResourceHandler::ResumeRedirect() {
   deferred_response_.swap(response);
 
   bool defer = false;
-  if (!OnRequestRedirected(request_id_, new_url, response, &defer)) {
+  if (!OnRequestRedirected(request_id_, new_url, response.get(), &defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
@@ -174,7 +174,7 @@ void ThrottlingResourceHandler::ResumeResponse() {
   deferred_response_.swap(response);
 
   bool defer = false;
-  if (!OnResponseStarted(request_id_, response, &defer)) {
+  if (!OnResponseStarted(request_id_, response.get(), &defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
diff --git a/content/browser/net/sqlite_persistent_cookie_store.cc b/content/browser/net/sqlite_persistent_cookie_store.cc
index 44de307..00215f8 100644
--- a/content/browser/net/sqlite_persistent_cookie_store.cc
+++ b/content/browser/net/sqlite_persistent_cookie_store.cc
@@ -1069,7 +1069,7 @@ void SQLitePersistentCookieStore::Backend::DeleteSessionCookiesOnShutdown() {
   if (!db_)
     return;
 
-  if (!special_storage_policy_)
+  if (!special_storage_policy_.get())
     return;
 
   sql::Statement del_smt(db_->GetCachedStatement(
diff --git a/content/browser/net/view_http_cache_job_factory.cc b/content/browser/net/view_http_cache_job_factory.cc
index 7738f8f..9eece52 100644
--- a/content/browser/net/view_http_cache_job_factory.cc
+++ b/content/browser/net/view_http_cache_job_factory.cc
@@ -103,7 +103,7 @@ void ViewHttpCacheJob::Start() {
 
 void ViewHttpCacheJob::Kill() {
   weak_factory_.InvalidateWeakPtrs();
-  if (core_) {
+  if (core_.get()) {
     core_->Orphan();
     core_ = NULL;
   }
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
index ff8aed4..5f68214 100644
--- a/content/browser/plugin_service_impl.cc
+++ b/content/browser/plugin_service_impl.cc
@@ -603,7 +603,7 @@ void PluginServiceImpl::GetPlugins(const GetPluginsCallback& callback) {
   } else {
     // If we switch back to loading plugins in process, then we need to make
     // sure g_thread_init() gets called since plugins may call glib at load.
-    if (!plugin_loader_)
+    if (!plugin_loader_.get())
       plugin_loader_ = new PluginLoaderPosix;
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
         base::Bind(&PluginLoaderPosix::LoadPlugins, plugin_loader_,
diff --git a/content/browser/renderer_host/database_message_filter.cc b/content/browser/renderer_host/database_message_filter.cc
index e32765d..9385bb0 100644
--- a/content/browser/renderer_host/database_message_filter.cc
+++ b/content/browser/renderer_host/database_message_filter.cc
@@ -44,7 +44,7 @@ DatabaseMessageFilter::DatabaseMessageFilter(
     webkit_database::DatabaseTracker* db_tracker)
     : db_tracker_(db_tracker),
       observer_added_(false) {
-  DCHECK(db_tracker_);
+  DCHECK(db_tracker_.get());
 }
 
 void DatabaseMessageFilter::OnChannelClosing() {
@@ -135,9 +135,9 @@ void DatabaseMessageFilter::OnDatabaseOpenFile(const string16& vfs_file_name,
                                             &database_name, NULL) &&
              !db_tracker_->IsDatabaseScheduledForDeletion(origin_identifier,
                                                           database_name)) {
-      base::FilePath db_file =
-          DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);
-      if (!db_file.empty()) {
+    base::FilePath db_file = DatabaseUtil::GetFullFilePathForVfsFile(
+        db_tracker_.get(), vfs_file_name);
+    if (!db_file.empty()) {
         if (db_tracker_->IsIncognitoProfile()) {
           db_tracker_->GetIncognitoFileHandle(vfs_file_name, &file_handle);
           if (file_handle == base::kInvalidPlatformFileValue) {
@@ -180,7 +180,7 @@ void DatabaseMessageFilter::DatabaseDeleteFile(const string16& vfs_file_name,
   // be deleted after kNumDeleteRetries attempts.
   int error_code = SQLITE_IOERR_DELETE;
   base::FilePath db_file =
-      DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);
+      DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_.get(), vfs_file_name);
   if (!db_file.empty()) {
     // In order to delete a journal file in incognito mode, we only need to
     // close the open handle to it that's stored in the database tracker.
@@ -222,7 +222,7 @@ void DatabaseMessageFilter::OnDatabaseGetFileAttributes(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   int32 attributes = -1;
   base::FilePath db_file =
-      DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);
+      DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_.get(), vfs_file_name);
   if (!db_file.empty())
     attributes = VfsBackend::GetFileAttributes(db_file);
 
@@ -236,7 +236,7 @@ void DatabaseMessageFilter::OnDatabaseGetFileSize(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   int64 size = 0;
   base::FilePath db_file =
-      DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);
+      DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_.get(), vfs_file_name);
   if (!db_file.empty())
     size = VfsBackend::GetFileSize(db_file);
 
diff --git a/content/browser/renderer_host/media/audio_input_device_manager.cc b/content/browser/renderer_host/media/audio_input_device_manager.cc
index 5f87a75..762381b 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager.cc
+++ b/content/browser/renderer_host/media/audio_input_device_manager.cc
@@ -49,7 +49,7 @@ void AudioInputDeviceManager::Register(
     base::MessageLoopProxy* device_thread_loop) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!listener_);
-  DCHECK(!device_loop_);
+  DCHECK(!device_loop_.get());
   listener_ = listener;
   device_loop_ = device_thread_loop;
 }
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc
index 38a45f2..e97bad7 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc
@@ -285,7 +285,7 @@ void AudioInputRendererHost::OnCreateStream(
         entry->writer.get());
   }
 
-  if (!entry->controller) {
+  if (!entry->controller.get()) {
     SendErrorMessage(stream_id);
     return;
   }
@@ -395,7 +395,7 @@ AudioInputRendererHost::AudioEntry* AudioInputRendererHost::LookupByController(
   // TODO(hclam): Implement a faster look up method.
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
-    if (controller == i->second->controller)
+    if (controller == i->second->controller.get())
       return i->second;
   }
   return NULL;
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index 3b21720..59bb567 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -45,9 +45,7 @@ class AudioRendererHost::AudioEntry
     return render_view_id_;
   }
 
-  media::AudioOutputController* controller() const {
-    return controller_;
-  }
+  media::AudioOutputController* controller() const { return controller_.get(); }
 
   base::SharedMemory* shared_memory() {
     return shared_memory_.get();
@@ -95,7 +93,7 @@ AudioRendererHost::AudioEntry::AudioEntry(
           host->audio_manager_, this, params, reader.get())),
       shared_memory_(shared_memory.Pass()),
       reader_(reader.Pass()) {
-  DCHECK(controller_);
+  DCHECK(controller_.get());
 }
 
 AudioRendererHost::AudioEntry::~AudioEntry() {}
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index 6a674a4..bd4913b 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -198,7 +198,7 @@ class AudioRendererHostTest : public testing::Test {
   void Create() {
     EXPECT_CALL(*observer_,
                 OnSetAudioStreamStatus(_, kStreamId, "created"));
-    EXPECT_CALL(*host_, OnStreamCreated(kStreamId, _))
+    EXPECT_CALL(*host_.get(), OnStreamCreated(kStreamId, _))
         .WillOnce(QuitMessageLoop(message_loop_.get()));
     EXPECT_CALL(mirroring_manager_,
                 AddDiverter(kRenderProcessId, kRenderViewId, NotNull()))
@@ -239,7 +239,7 @@ class AudioRendererHostTest : public testing::Test {
   void Play() {
     EXPECT_CALL(*observer_,
                 OnSetAudioStreamPlaying(_, kStreamId, true));
-    EXPECT_CALL(*host_, OnStreamPlaying(kStreamId))
+    EXPECT_CALL(*host_.get(), OnStreamPlaying(kStreamId))
         .WillOnce(QuitMessageLoop(message_loop_.get()));
 
     host_->OnPlayStream(kStreamId);
@@ -249,7 +249,7 @@ class AudioRendererHostTest : public testing::Test {
   void Pause() {
     EXPECT_CALL(*observer_,
                 OnSetAudioStreamPlaying(_, kStreamId, false));
-    EXPECT_CALL(*host_, OnStreamPaused(kStreamId))
+    EXPECT_CALL(*host_.get(), OnStreamPaused(kStreamId))
         .WillOnce(QuitMessageLoop(message_loop_.get()));
 
     host_->OnPauseStream(kStreamId);
@@ -271,7 +271,7 @@ class AudioRendererHostTest : public testing::Test {
         << "Calls Create() before calling this method";
 
     // Expect an error signal sent through IPC.
-    EXPECT_CALL(*host_, OnStreamError(kStreamId));
+    EXPECT_CALL(*host_.get(), OnStreamError(kStreamId));
 
     // Simulate an error sent from the audio device.
     host_->ReportErrorAndClose(kStreamId);
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
index ceefb98..4724338 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
@@ -160,7 +160,7 @@ class MediaStreamDispatcherHostTest : public testing::Test {
     // Use the fake content client and browser.
     content_client_.reset(new TestContentClient);
     SetContentClient(content_client_.get());
-    old_browser_client_ = SetBrowserClientForTesting(host_);
+    old_browser_client_ = SetBrowserClientForTesting(host_.get());
   }
 
   virtual void SetupFakeUI(bool expect_started) {
@@ -197,7 +197,7 @@ TEST_F(MediaStreamDispatcherHostTest, GenerateStream) {
   StreamOptions options(MEDIA_NO_SERVICE, MEDIA_DEVICE_VIDEO_CAPTURE);
 
   SetupFakeUI(true);
-  EXPECT_CALL(*host_, OnStreamGenerated(kRenderId, kPageRequestId, 0, 1));
+  EXPECT_CALL(*host_.get(), OnStreamGenerated(kRenderId, kPageRequestId, 0, 1));
   host_->OnGenerateStream(kPageRequestId, options);
 
   WaitForResult();
@@ -220,7 +220,7 @@ TEST_F(MediaStreamDispatcherHostTest, GenerateThreeStreams) {
 
   // Generate first stream.
   SetupFakeUI(true);
-  EXPECT_CALL(*host_, OnStreamGenerated(kRenderId, kPageRequestId, 0, 1));
+  EXPECT_CALL(*host_.get(), OnStreamGenerated(kRenderId, kPageRequestId, 0, 1));
   host_->OnGenerateStream(kPageRequestId, options);
 
   WaitForResult();
@@ -236,9 +236,9 @@ TEST_F(MediaStreamDispatcherHostTest, GenerateThreeStreams) {
 
   // Generate second stream.
   SetupFakeUI(true);
-  EXPECT_CALL(*host_, OnStreamGenerated(kRenderId, kPageRequestId + 1, 0, 1));
-  host_->OnGenerateStream(kPageRequestId+1, options);
-
+  EXPECT_CALL(*host_.get(),
+              OnStreamGenerated(kRenderId, kPageRequestId + 1, 0, 1));
+  host_->OnGenerateStream(kPageRequestId + 1, options);
 
   WaitForResult();
 
@@ -255,8 +255,9 @@ TEST_F(MediaStreamDispatcherHostTest, GenerateThreeStreams) {
 
   // Generate third stream.
   SetupFakeUI(true);
-  EXPECT_CALL(*host_, OnStreamGenerated(kRenderId, kPageRequestId + 2, 0, 1));
-  host_->OnGenerateStream(kPageRequestId+2, options);
+  EXPECT_CALL(*host_.get(),
+              OnStreamGenerated(kRenderId, kPageRequestId + 2, 0, 1));
+  host_->OnGenerateStream(kPageRequestId + 2, options);
 
   WaitForResult();
 
@@ -284,7 +285,8 @@ TEST_F(MediaStreamDispatcherHostTest, FailOpenVideoDevice) {
   media::FakeVideoCaptureDevice::SetFailNextCreate();
   SetupFakeUI(false);
   host_->OnGenerateStream(kPageRequestId, options);
-  EXPECT_CALL(*host_, OnStreamGenerationFailed(kRenderId, kPageRequestId));
+  EXPECT_CALL(*host_.get(),
+              OnStreamGenerationFailed(kRenderId, kPageRequestId));
   WaitForResult();
 }
 
@@ -312,7 +314,8 @@ TEST_F(MediaStreamDispatcherHostTest, StopGeneratedStreamsOnChannelClosing) {
   size_t generated_streams = 3;
   for (size_t i = 0; i < generated_streams; ++i) {
     SetupFakeUI(true);
-    EXPECT_CALL(*host_, OnStreamGenerated(kRenderId, kPageRequestId + i, 0, 1));
+    EXPECT_CALL(*host_.get(),
+                OnStreamGenerated(kRenderId, kPageRequestId + i, 0, 1));
     host_->OnGenerateStream(kPageRequestId + i, options);
 
     // Wait until the stream is generated.
@@ -338,8 +341,9 @@ TEST_F(MediaStreamDispatcherHostTest, CloseFromUI) {
     .WillOnce(SaveArg<0>(&close_callback));
   media_stream_manager_->UseFakeUI(stream_ui.PassAs<MediaStreamUI>());
 
-  EXPECT_CALL(*host_, OnStreamGenerated(kRenderId, kPageRequestId, 0, 1));
-  EXPECT_CALL(*host_, OnStreamGenerationFailed(kRenderId, kPageRequestId));
+  EXPECT_CALL(*host_.get(), OnStreamGenerated(kRenderId, kPageRequestId, 0, 1));
+  EXPECT_CALL(*host_.get(),
+              OnStreamGenerationFailed(kRenderId, kPageRequestId));
   host_->OnGenerateStream(kPageRequestId, options);
 
   WaitForResult();
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 1d63262..84c2dc1 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -176,14 +176,14 @@ MediaStreamManager::~MediaStreamManager() {
 
 VideoCaptureManager* MediaStreamManager::video_capture_manager() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(video_capture_manager_);
-  return video_capture_manager_;
+  DCHECK(video_capture_manager_.get());
+  return video_capture_manager_.get();
 }
 
 AudioInputDeviceManager* MediaStreamManager::audio_input_device_manager() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(audio_input_device_manager_);
-  return audio_input_device_manager_;
+  DCHECK(audio_input_device_manager_.get());
+  return audio_input_device_manager_.get();
 }
 
 std::string MediaStreamManager::MakeMediaAccessRequest(
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool.cc b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
index 8a6a0f86b..65c9497 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
@@ -91,7 +91,7 @@ scoped_refptr<media::VideoFrame> VideoCaptureBufferPool::ReserveForProducer(
 
   if (buffer->rotation != rotation) {
     // TODO(nick): Generalize the |rotation| mechanism.
-    media::FillYUV(frame, 0, 128, 128);
+    media::FillYUV(frame.get(), 0, 128, 128);
     buffer->rotation = rotation;
   }
 
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
index f26b51a..60d5881 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
@@ -35,9 +35,9 @@ TEST(VideoCaptureBufferPoolTest, BufferPool) {
   ASSERT_TRUE(NULL != frame3.get());
 
   // Touch the memory.
-  media::FillYUV(frame1, 0x11, 0x22, 0x33);
-  media::FillYUV(frame2, 0x44, 0x55, 0x66);
-  media::FillYUV(frame3, 0x77, 0x88, 0x99);
+  media::FillYUV(frame1.get(), 0x11, 0x22, 0x33);
+  media::FillYUV(frame2.get(), 0x44, 0x55, 0x66);
+  media::FillYUV(frame3.get(), 0x77, 0x88, 0x99);
 
   // Fourth frame should fail.
   ASSERT_EQ(NULL, pool->ReserveForProducer(0).get()) << "Pool should be empty";
@@ -87,7 +87,7 @@ TEST(VideoCaptureBufferPoolTest, BufferPool) {
   pool->RelinquishConsumerHold(buffer_id3, 1);
   ASSERT_FALSE(pool->IsAnyBufferHeldForConsumers());
   frame3 = pool->ReserveForProducer(0);
-  ASSERT_TRUE(NULL != frame3);
+  ASSERT_TRUE(NULL != frame3.get());
   ASSERT_FALSE(pool->IsAnyBufferHeldForConsumers());
   ASSERT_EQ(NULL, pool->ReserveForProducer(0).get()) << "Pool should be empty";
 
@@ -106,7 +106,7 @@ TEST(VideoCaptureBufferPoolTest, BufferPool) {
   ASSERT_EQ(NULL, pool->ReserveForProducer(0).get()) << "Pool should be empty";
   frame1 = NULL;  // Should free the frame.
   frame2 = pool->ReserveForProducer(0);
-  ASSERT_TRUE(NULL != frame2);
+  ASSERT_TRUE(NULL != frame2.get());
   ASSERT_EQ(buffer_id1, pool->RecognizeReservedBuffer(frame2));
   ASSERT_EQ(NULL, pool->ReserveForProducer(0).get()) << "Pool should be empty";
 
@@ -114,7 +114,7 @@ TEST(VideoCaptureBufferPoolTest, BufferPool) {
   // that this buffer has been through the consumer-hold cycle.
   frame2 = NULL;
   frame1 = pool->ReserveForProducer(0);
-  ASSERT_TRUE(NULL != frame1);
+  ASSERT_TRUE(NULL != frame1.get());
   ASSERT_EQ(buffer_id1, pool->RecognizeReservedBuffer(frame1));
   ASSERT_EQ(NULL, pool->ReserveForProducer(0).get()) << "Pool should be empty";
 
@@ -124,12 +124,12 @@ TEST(VideoCaptureBufferPoolTest, BufferPool) {
   pool = NULL;
 
   // Touch the memory.
-  media::FillYUV(frame1, 0x11, 0x22, 0x33);
-  media::FillYUV(frame4, 0x44, 0x55, 0x66);
+  media::FillYUV(frame1.get(), 0x11, 0x22, 0x33);
+  media::FillYUV(frame4.get(), 0x44, 0x55, 0x66);
 
   frame1 = NULL;
 
-  media::FillYUV(frame4, 0x44, 0x55, 0x66);
+  media::FillYUV(frame4.get(), 0x44, 0x55, 0x66);
   frame4 = NULL;
 }
 
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index a0a0cd1..ef5aba2 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -178,9 +178,10 @@ void VideoCaptureController::StopCapture(
     return;
 
   // Take back all buffers held by the |client|.
-  if (buffer_pool_) {
+  if (buffer_pool_.get()) {
     for (std::set<int>::iterator buffer_it = client->buffers.begin();
-         buffer_it != client->buffers.end(); ++buffer_it) {
+         buffer_it != client->buffers.end();
+         ++buffer_it) {
       int buffer_id = *buffer_it;
       buffer_pool_->RelinquishConsumerHold(buffer_id, 1);
     }
@@ -246,7 +247,7 @@ void VideoCaptureController::ReturnBuffer(
 
 scoped_refptr<media::VideoFrame> VideoCaptureController::ReserveOutputBuffer() {
   base::AutoLock lock(buffer_pool_lock_);
-  if (!buffer_pool_)
+  if (!buffer_pool_.get())
     return NULL;
   return buffer_pool_->ReserveForProducer(0);
 }
@@ -268,12 +269,12 @@ void VideoCaptureController::OnIncomingCapturedFrame(
   scoped_refptr<media::VideoFrame> dst;
   {
     base::AutoLock lock(buffer_pool_lock_);
-    if (!buffer_pool_)
+    if (!buffer_pool_.get())
       return;
     dst = buffer_pool_->ReserveForProducer(rotation);
   }
 
-  if (!dst)
+  if (!dst.get())
     return;
 
   uint8* yplane = dst->data(media::VideoFrame::kYPlane);
@@ -367,7 +368,7 @@ void VideoCaptureController::OnIncomingCapturedVideoFrame(
   {
     base::AutoLock lock(buffer_pool_lock_);
 
-    if (!buffer_pool_)
+    if (!buffer_pool_.get())
       return;
 
     // If this is a frame that belongs to the buffer pool, we can forward it
@@ -384,7 +385,7 @@ void VideoCaptureController::OnIncomingCapturedVideoFrame(
     target = buffer_pool_->ReserveForProducer(0);
   }
 
-  if (!target)
+  if (!target.get())
     return;
 
   // Validate the inputs.
@@ -422,15 +423,15 @@ void VideoCaptureController::OnIncomingCapturedVideoFrame(
       media::CopyYPlane(frame->data(kYPlane),
                         frame->stride(kYPlane),
                         frame->rows(kYPlane),
-                        target);
+                        target.get());
       media::CopyUPlane(frame->data(kUPlane),
                         frame->stride(kUPlane),
                         frame->rows(kUPlane),
-                        target);
+                        target.get());
       media::CopyVPlane(frame->data(kVPlane),
                         frame->stride(kVPlane),
                         frame->rows(kVPlane),
-                        target);
+                        target.get());
       break;
     }
     case media::VideoFrame::YV12A: {
@@ -438,19 +439,19 @@ void VideoCaptureController::OnIncomingCapturedVideoFrame(
       media::CopyYPlane(frame->data(kYPlane),
                         frame->stride(kYPlane),
                         frame->rows(kYPlane),
-                        target);
+                        target.get());
       media::CopyUPlane(frame->data(kUPlane),
                         frame->stride(kUPlane),
                         frame->rows(kUPlane),
-                        target);
+                        target.get());
       media::CopyVPlane(frame->data(kVPlane),
                         frame->stride(kVPlane),
                         frame->rows(kVPlane),
-                        target);
+                        target.get());
       media::CopyAPlane(frame->data(kAPlane),
                         frame->stride(kAPlane),
                         frame->rows(kAPlane),
-                        target);
+                        target.get());
       break;
     }
     case media::VideoFrame::RGB32: {
@@ -520,7 +521,7 @@ void VideoCaptureController::DoIncomingCapturedFrameOnIOThread(
     base::Time timestamp) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  if (!buffer_pool_)
+  if (!buffer_pool_.get())
     return;
 
   int buffer_id = buffer_pool_->RecognizeReservedBuffer(reserved_frame);
@@ -548,7 +549,7 @@ void VideoCaptureController::DoIncomingCapturedFrameOnIOThread(
 
 void VideoCaptureController::DoFrameInfoOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(!buffer_pool_)
+  DCHECK(!buffer_pool_.get())
       << "Device is restarted without releasing shared memory.";
 
   // Allocate memory only when device has been started.
@@ -609,7 +610,7 @@ void VideoCaptureController::SendFrameInfoAndBuffers(ControllerClient* client) {
   client->event_handler->OnFrameInfo(client->controller_id,
                                      frame_info_.width, frame_info_.height,
                                      frame_info_.frame_rate);
-  if (!buffer_pool_)
+  if (!buffer_pool_.get())
     return;
 
   for (int buffer_id = 1; buffer_id <= buffer_pool_->count(); ++buffer_id) {
@@ -660,7 +661,7 @@ void VideoCaptureController::PostStopping() {
 
   // When clients still have some buffers, or device has not been stopped yet,
   // do nothing.
-  if ((buffer_pool_ && buffer_pool_->IsAnyBufferHeldForConsumers()) ||
+  if ((buffer_pool_.get() && buffer_pool_->IsAnyBufferHeldForConsumers()) ||
       device_in_use_)
     return;
 
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
index 544001f9..bc67fe4 100644
--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -156,10 +156,9 @@ class VideoCaptureControllerTest : public testing::Test {
 
     vcm_ = new MockVideoCaptureManager();
     vcm_->Init();
-    controller_ = new VideoCaptureController(vcm_);
-    controller_handler_.reset(
-        new MockVideoCaptureControllerEventHandler(controller_.get(),
-                                                   message_loop_.get()));
+    controller_ = new VideoCaptureController(vcm_.get());
+    controller_handler_.reset(new MockVideoCaptureControllerEventHandler(
+        controller_.get(), message_loop_.get()));
   }
 
   virtual void TearDown() OVERRIDE {}
@@ -184,11 +183,10 @@ TEST_F(VideoCaptureControllerTest, StartAndStop) {
   capture_params.frame_per_second = 30;
 
   InSequence s;
-  EXPECT_CALL(*vcm_,
+  EXPECT_CALL(*vcm_.get(),
               StartCapture(capture_params.width,
                            capture_params.height,
-                           controller_.get()))
-      .Times(1);
+                           controller_.get())).Times(1);
   EXPECT_CALL(*controller_handler_,
               DoFrameInfo(controller_handler_->controller_id_))
       .Times(AtLeast(1));
@@ -202,9 +200,7 @@ TEST_F(VideoCaptureControllerTest, StartAndStop) {
                             controller_handler_->controller_id_,
                             controller_handler_.get(),
                             message_loop_.get()));
-  EXPECT_CALL(*vcm_,
-              StopCapture(vcm_->video_session_id_))
-      .Times(1);
+  EXPECT_CALL(*vcm_.get(), StopCapture(vcm_->video_session_id_)).Times(1);
 
   controller_->StartCapture(controller_handler_->controller_id_,
                             controller_handler_.get(),
@@ -222,11 +218,10 @@ TEST_F(VideoCaptureControllerTest, StopSession) {
   capture_params.frame_per_second = 30;
 
   InSequence s;
-  EXPECT_CALL(*vcm_,
+  EXPECT_CALL(*vcm_.get(),
               StartCapture(capture_params.width,
                            capture_params.height,
-                           controller_.get()))
-      .Times(1);
+                           controller_.get())).Times(1);
   EXPECT_CALL(*controller_handler_,
               DoFrameInfo(controller_handler_->controller_id_))
       .Times(AtLeast(1));
@@ -258,9 +253,7 @@ TEST_F(VideoCaptureControllerTest, StopSession) {
       base::MessageLoop::QuitClosure(), base::TimeDelta::FromSeconds(1));
   message_loop_->Run();
 
-  EXPECT_CALL(*vcm_,
-              StopCapture(vcm_->video_session_id_))
-      .Times(1);
+  EXPECT_CALL(*vcm_.get(), StopCapture(vcm_->video_session_id_)).Times(1);
   controller_->StopCapture(controller_handler_->controller_id_,
                            controller_handler_.get());
 }
diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc
index 91d8f51..9c4fc77 100644
--- a/content/browser/renderer_host/media/video_capture_host.cc
+++ b/content/browser/renderer_host/media/video_capture_host.cc
@@ -32,7 +32,7 @@ void VideoCaptureHost::OnChannelClosing() {
 
   // Since the IPC channel is gone, close all requested VideCaptureDevices.
   for (EntryMap::iterator it = entries_.begin(); it != entries_.end(); it++) {
-    VideoCaptureController* controller = it->second->controller;
+    VideoCaptureController* controller = it->second->controller.get();
     if (controller) {
       VideoCaptureControllerID controller_id(it->first);
       controller->StopCapture(controller_id, this);
@@ -255,7 +255,7 @@ void VideoCaptureHost::OnReceiveEmptyBuffer(int device_id, int buffer_id) {
   EntryMap::iterator it = entries_.find(controller_id);
   if (it != entries_.end()) {
     scoped_refptr<VideoCaptureController> controller = it->second->controller;
-    if (controller)
+    if (controller.get())
       controller->ReturnBuffer(controller_id, this, buffer_id);
   }
 }
@@ -268,7 +268,7 @@ void VideoCaptureHost::DeleteVideoCaptureControllerOnIOThread(
   if (it == entries_.end())
     return;
 
-  VideoCaptureController* controller = it->second->controller;
+  VideoCaptureController* controller = it->second->controller.get();
   if (controller) {
     controller->StopCapture(controller_id, this);
     GetVideoCaptureManager()->RemoveController(controller, this);
diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
index 6da2b9f..3f35988 100644
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -223,10 +223,10 @@ class VideoCaptureHostTest : public testing::Test {
   virtual void TearDown() OVERRIDE {
     // Verifies and removes the expectations on host_ and
     // returns true iff successful.
-    Mock::VerifyAndClearExpectations(host_);
+    Mock::VerifyAndClearExpectations(host_.get());
 
-    EXPECT_CALL(*host_, OnStateChanged(kDeviceId,
-                                       VIDEO_CAPTURE_STATE_STOPPED))
+    EXPECT_CALL(*host_.get(),
+                OnStateChanged(kDeviceId, VIDEO_CAPTURE_STATE_STOPPED))
         .Times(AnyNumber());
 
     // Simulate closing the IPC channel.
@@ -247,21 +247,19 @@ class VideoCaptureHostTest : public testing::Test {
   void StartCapture() {
     InSequence s;
     // 1. First - get info about the new resolution
-    EXPECT_CALL(*host_, OnDeviceInfo(kDeviceId));
+    EXPECT_CALL(*host_.get(), OnDeviceInfo(kDeviceId));
 
     // 2. Change state to started
-    EXPECT_CALL(*host_, OnStateChanged(kDeviceId,
-                                       VIDEO_CAPTURE_STATE_STARTED));
+    EXPECT_CALL(*host_.get(),
+                OnStateChanged(kDeviceId, VIDEO_CAPTURE_STATE_STARTED));
 
     // 3. Newly created buffers will arrive.
-    EXPECT_CALL(*host_, OnNewBufferCreated(kDeviceId, _, _, _))
-        .Times(AnyNumber())
-        .WillRepeatedly(Return());
+    EXPECT_CALL(*host_.get(), OnNewBufferCreated(kDeviceId, _, _, _))
+        .Times(AnyNumber()).WillRepeatedly(Return());
 
     // 4. First filled buffer will arrive.
-    EXPECT_CALL(*host_, OnBufferFilled(kDeviceId, _, _))
-        .Times(AnyNumber())
-        .WillOnce(ExitMessageLoop(message_loop_.get()));
+    EXPECT_CALL(*host_.get(), OnBufferFilled(kDeviceId, _, _))
+        .Times(AnyNumber()).WillOnce(ExitMessageLoop(message_loop_.get()));
 
     media::VideoCaptureParams params;
     params.width = 352;
@@ -298,8 +296,8 @@ class VideoCaptureHostTest : public testing::Test {
 #endif
 
   void StopCapture() {
-    EXPECT_CALL(*host_, OnStateChanged(kDeviceId,
-                                       VIDEO_CAPTURE_STATE_STOPPED))
+    EXPECT_CALL(*host_.get(),
+                OnStateChanged(kDeviceId, VIDEO_CAPTURE_STATE_STOPPED))
         .WillOnce(ExitMessageLoop(message_loop_.get()));
 
     host_->OnStopCapture(kDeviceId);
@@ -314,9 +312,8 @@ class VideoCaptureHostTest : public testing::Test {
   }
 
   void NotifyPacketReady() {
-    EXPECT_CALL(*host_, OnBufferFilled(kDeviceId, _, _))
-        .Times(AnyNumber())
-        .WillOnce(ExitMessageLoop(message_loop_.get()))
+    EXPECT_CALL(*host_.get(), OnBufferFilled(kDeviceId, _, _))
+        .Times(AnyNumber()).WillOnce(ExitMessageLoop(message_loop_.get()))
         .RetiresOnSaturation();
     message_loop_->Run();
   }
@@ -327,8 +324,8 @@ class VideoCaptureHostTest : public testing::Test {
 
   void SimulateError() {
     // Expect a change state to error state  sent through IPC.
-    EXPECT_CALL(*host_, OnStateChanged(kDeviceId, VIDEO_CAPTURE_STATE_ERROR))
-        .Times(1);
+    EXPECT_CALL(*host_.get(),
+                OnStateChanged(kDeviceId, VIDEO_CAPTURE_STATE_ERROR)).Times(1);
     VideoCaptureControllerID id(kDeviceId);
     host_->OnError(id);
     // Wait for the error callback.
@@ -365,9 +362,8 @@ TEST_F(VideoCaptureHostTest, StartCaptureErrorStop) {
 }
 
 TEST_F(VideoCaptureHostTest, StartCaptureError) {
-  EXPECT_CALL(*host_, OnStateChanged(kDeviceId,
-                                     VIDEO_CAPTURE_STATE_STOPPED))
-      .Times(0);
+  EXPECT_CALL(*host_.get(),
+              OnStateChanged(kDeviceId, VIDEO_CAPTURE_STATE_STOPPED)).Times(0);
   StartCapture();
   NotifyPacketReady();
   SimulateError();
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index d722514..1f0b019 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -62,7 +62,7 @@ void VideoCaptureManager::Register(MediaStreamProviderListener* listener,
                                    base::MessageLoopProxy* device_thread_loop) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!listener_);
-  DCHECK(!device_loop_);
+  DCHECK(!device_loop_.get());
   listener_ = listener;
   device_loop_ = device_thread_loop;
 }
@@ -487,13 +487,14 @@ void VideoCaptureManager::DoAddControllerOnDeviceThread(
     Controllers::iterator cit = controllers_.find(video_capture_device);
     if (cit == controllers_.end()) {
       controller = new VideoCaptureController(this);
-      controllers_[video_capture_device] = new Controller(controller, handler);
+      controllers_[video_capture_device] =
+          new Controller(controller.get(), handler);
     } else {
       controllers_[video_capture_device]->handlers.push_front(handler);
       controller = controllers_[video_capture_device]->controller;
     }
   }
-  added_cb.Run(controller);
+  added_cb.Run(controller.get());
 }
 
 void VideoCaptureManager::RemoveController(
@@ -513,7 +514,7 @@ void VideoCaptureManager::DoRemoveControllerOnDeviceThread(
 
   for (Controllers::iterator cit = controllers_.begin();
        cit != controllers_.end(); ++cit) {
-    if (controller == cit->second->controller) {
+    if (controller == cit->second->controller.get()) {
       Handlers& handlers = cit->second->handlers;
       for (Handlers::iterator hit = handlers.begin();
            hit != handlers.end(); ++hit) {
diff --git a/content/browser/renderer_host/media/web_contents_audio_input_stream.cc b/content/browser/renderer_host/media/web_contents_audio_input_stream.cc
index 4e1928a..37afa5f 100644
--- a/content/browser/renderer_host/media/web_contents_audio_input_stream.cc
+++ b/content/browser/renderer_host/media/web_contents_audio_input_stream.cc
@@ -116,9 +116,9 @@ WebContentsAudioInputStream::Impl::Impl(
       target_render_process_id_(render_process_id),
       target_render_view_id_(render_view_id),
       callback_(NULL) {
-  DCHECK(message_loop_);
+  DCHECK(message_loop_.get());
   DCHECK(mirroring_manager_);
-  DCHECK(tracker_);
+  DCHECK(tracker_.get());
   DCHECK(mixer_stream_.get());
 }
 
@@ -237,7 +237,9 @@ media::AudioOutputStream* WebContentsAudioInputStream::Impl::AddInput(
   // guarantee the VirtualAudioInputStream (mixer_stream_) outlives the
   // VirtualAudioOutputStream.
   return new media::VirtualAudioOutputStream(
-      params, message_loop_, mixer_stream_.get(),
+      params,
+      message_loop_.get(),
+      mixer_stream_.get(),
       base::Bind(&Impl::ReleaseInput, this));
 }
 
diff --git a/content/browser/renderer_host/media/web_contents_audio_input_stream_unittest.cc b/content/browser/renderer_host/media/web_contents_audio_input_stream_unittest.cc
index ffd9cbb..61b7308 100644
--- a/content/browser/renderer_host/media/web_contents_audio_input_stream_unittest.cc
+++ b/content/browser/renderer_host/media/web_contents_audio_input_stream_unittest.cc
@@ -209,13 +209,12 @@ class WebContentsAudioInputStreamTest : public testing::Test {
 
     ASSERT_EQ(kRenderProcessId, current_render_process_id_);
     ASSERT_EQ(kRenderViewId, current_render_view_id_);
-    EXPECT_CALL(*mock_tracker_, Start(kRenderProcessId, kRenderViewId, _))
+    EXPECT_CALL(*mock_tracker_.get(), Start(kRenderProcessId, kRenderViewId, _))
         .WillOnce(DoAll(
-            SaveArg<2>(&change_callback_),
-            WithArgs<0, 1>(
-                Invoke(&change_callback_,
-                       &WebContentsTracker::ChangeCallback::Run))));
-    EXPECT_CALL(*mock_tracker_, Stop());  // At Close() time.
+             SaveArg<2>(&change_callback_),
+             WithArgs<0, 1>(Invoke(&change_callback_,
+                                   &WebContentsTracker::ChangeCallback::Run))));
+    EXPECT_CALL(*mock_tracker_.get(), Stop());  // At Close() time.
 
     wcais_ = new WebContentsAudioInputStream(
         current_render_process_id_, current_render_view_id_,
diff --git a/content/browser/renderer_host/media/web_contents_tracker.cc b/content/browser/renderer_host/media/web_contents_tracker.cc
index 68e76c5..a13dc12 100644
--- a/content/browser/renderer_host/media/web_contents_tracker.cc
+++ b/content/browser/renderer_host/media/web_contents_tracker.cc
@@ -20,10 +20,10 @@ WebContentsTracker::~WebContentsTracker() {
 
 void WebContentsTracker::Start(int render_process_id, int render_view_id,
                                const ChangeCallback& callback) {
-  DCHECK(!message_loop_ || message_loop_->BelongsToCurrentThread());
+  DCHECK(!message_loop_.get() || message_loop_->BelongsToCurrentThread());
 
   message_loop_ = base::MessageLoopProxy::current();
-  DCHECK(message_loop_);
+  DCHECK(message_loop_.get());
   callback_ = callback;
 
   BrowserThread::PostTask(
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc
index 0ec99a6..9fcd0ed 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc
+++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc
@@ -438,12 +438,14 @@ bool ThreadSafeCaptureOracle::ObserveEventAndDecideCapture(
        "paint"));
 
   // Consider the various reasons not to initiate a capture.
-  if (should_capture && !output_buffer) {
-    TRACE_EVENT_INSTANT1("mirroring", "EncodeLimited",
+  if (should_capture && !output_buffer.get()) {
+    TRACE_EVENT_INSTANT1("mirroring",
+                         "EncodeLimited",
                          TRACE_EVENT_SCOPE_THREAD,
-                         "trigger", event_name);
+                         "trigger",
+                         event_name);
     return false;
-  } else if (!should_capture && output_buffer) {
+  } else if (!should_capture && output_buffer.get()) {
     if (content_is_dirty) {
       // This is a normal and acceptable way to drop a frame. We've hit our
       // capture rate limit: for example, the content is animating at 60fps but
@@ -453,7 +455,7 @@ bool ThreadSafeCaptureOracle::ObserveEventAndDecideCapture(
                            "trigger", event_name);
     }
     return false;
-  } else if (!should_capture && !output_buffer) {
+  } else if (!should_capture && !output_buffer.get()) {
     // We decided not to capture, but we wouldn't have been able to if we wanted
     // to because no output buffer was available.
     TRACE_EVENT_INSTANT1("mirroring", "NearlyEncodeLimited",
@@ -686,7 +688,7 @@ void RenderVideoFrame(const SkBitmap& input,
         reinterpret_cast<uint8*>(scaled_bitmap.getPixels()),
         scaled_bitmap.rowBytes(),
         region_in_frame,
-        output);
+        output.get());
   }
 
   // The result is now ready.
@@ -740,8 +742,8 @@ scoped_ptr<CaptureMachine> CaptureMachine::Create(
     const scoped_refptr<base::SequencedTaskRunner>& render_task_runner,
     const scoped_refptr<ThreadSafeCaptureOracle>& oracle_proxy) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(render_task_runner);
-  DCHECK(oracle_proxy);
+  DCHECK(render_task_runner.get());
+  DCHECK(oracle_proxy.get());
   scoped_ptr<CaptureMachine> machine(
       new CaptureMachine(render_task_runner, oracle_proxy));
 
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
index 304dc2e..58f2914 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
+++ b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
@@ -175,7 +175,8 @@ class CaptureTestView : public TestRenderWidgetHostView {
       const scoped_refptr<media::VideoFrame>& target,
       const base::Callback<void(bool)>& callback) OVERRIDE {
     SkColor c = ConvertRgbToYuv(controller_->GetSolidColor());
-    media::FillYUV(target, SkColorGetR(c), SkColorGetG(c), SkColorGetB(c));
+    media::FillYUV(
+        target.get(), SkColorGetR(c), SkColorGetG(c), SkColorGetB(c));
     callback.Run(true);
     controller_->SignalCopy();
   }
@@ -197,9 +198,11 @@ class CaptureTestView : public TestRenderWidgetHostView {
     if (subscriber_ && subscriber_->ShouldCaptureFrame(present_time,
                                                        &target, &callback)) {
       SkColor c = ConvertRgbToYuv(controller_->GetSolidColor());
-      media::FillYUV(target, SkColorGetR(c), SkColorGetG(c), SkColorGetB(c));
-      BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-          base::Bind(callback, present_time, true));
+      media::FillYUV(
+          target.get(), SkColorGetR(c), SkColorGetG(c), SkColorGetB(c));
+      BrowserThread::PostTask(BrowserThread::UI,
+                              FROM_HERE,
+                              base::Bind(callback, present_time, true));
       controller_->SignalCopy();
     }
   }
@@ -447,7 +450,7 @@ class WebContentsVideoCaptureDeviceTest : public testing::Test {
     static_cast<SiteInstanceImpl*>(site_instance.get())->
         set_render_process_host_factory(render_process_host_factory_.get());
     web_contents_.reset(
-        TestWebContents::Create(browser_context_.get(), site_instance));
+        TestWebContents::Create(browser_context_.get(), site_instance.get()));
 
     // This is actually a CaptureTestRenderViewHost.
     RenderWidgetHostImpl* rwh =
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc
index 65d4c85..93b5b3b 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc
@@ -112,7 +112,7 @@ void P2PSocketHostTcpBase::OnConnected(int result) {
 void P2PSocketHostTcpBase::DoRead() {
   int result;
   do {
-    if (!read_buffer_) {
+    if (!read_buffer_.get()) {
       read_buffer_ = new net::GrowableIOBuffer();
       read_buffer_->SetCapacity(kReadBufferSize);
     } else if (read_buffer_->RemainingCapacity() < kReadBufferSize) {
@@ -123,9 +123,10 @@ void P2PSocketHostTcpBase::DoRead() {
       read_buffer_->SetCapacity(read_buffer_->capacity() + kReadBufferSize -
                                 read_buffer_->RemainingCapacity());
     }
-    result = socket_->Read(read_buffer_, read_buffer_->RemainingCapacity(),
-                           base::Bind(&P2PSocketHostTcp::OnRead,
-                                      base::Unretained(this)));
+    result = socket_->Read(
+        read_buffer_.get(),
+        read_buffer_->RemainingCapacity(),
+        base::Bind(&P2PSocketHostTcp::OnRead, base::Unretained(this)));
     DidCompleteRead(result);
   } while (result > 0);
 }
@@ -187,7 +188,7 @@ void P2PSocketHostTcpBase::Send(const net::IPEndPoint& to,
 
 void P2PSocketHostTcpBase::WriteOrQueue(
     scoped_refptr<net::DrainableIOBuffer>& buffer) {
-  if (write_buffer_) {
+  if (write_buffer_.get()) {
     write_queue_.push(buffer);
     return;
   }
@@ -197,10 +198,11 @@ void P2PSocketHostTcpBase::WriteOrQueue(
 }
 
 void P2PSocketHostTcpBase::DoWrite() {
-  while (write_buffer_ && state_ == STATE_OPEN && !write_pending_) {
-    int result = socket_->Write(write_buffer_, write_buffer_->BytesRemaining(),
-                                base::Bind(&P2PSocketHostTcp::OnWritten,
-                                           base::Unretained(this)));
+  while (write_buffer_.get() && state_ == STATE_OPEN && !write_pending_) {
+    int result = socket_->Write(
+        write_buffer_.get(),
+        write_buffer_->BytesRemaining(),
+        base::Bind(&P2PSocketHostTcp::OnWritten, base::Unretained(this)));
     HandleWriteResult(result);
   }
 }
@@ -215,7 +217,7 @@ void P2PSocketHostTcpBase::OnWritten(int result) {
 }
 
 void P2PSocketHostTcpBase::HandleWriteResult(int result) {
-  DCHECK(write_buffer_);
+  DCHECK(write_buffer_.get());
   if (result >= 0) {
     write_buffer_->DidConsume(result);
     if (write_buffer_->BytesRemaining() == 0) {
diff --git a/content/browser/renderer_host/p2p/socket_host_udp.cc b/content/browser/renderer_host/p2p/socket_host_udp.cc
index 402898cf..4aceadf 100644
--- a/content/browser/renderer_host/p2p/socket_host_udp.cc
+++ b/content/browser/renderer_host/p2p/socket_host_udp.cc
@@ -109,9 +109,11 @@ void P2PSocketHostUdp::OnError() {
 void P2PSocketHostUdp::DoRead() {
   int result;
   do {
-    result = socket_->RecvFrom(recv_buffer_, kReadBufferSize, &recv_address_,
-                               base::Bind(&P2PSocketHostUdp::OnRecv,
-                                          base::Unretained(this)));
+    result = socket_->RecvFrom(
+        recv_buffer_.get(),
+        kReadBufferSize,
+        &recv_address_,
+        base::Bind(&P2PSocketHostUdp::OnRecv, base::Unretained(this)));
     if (result == net::ERR_IO_PENDING)
       return;
     HandleReadResult(result);
@@ -181,17 +183,21 @@ void P2PSocketHostUdp::Send(const net::IPEndPoint& to,
 void P2PSocketHostUdp::DoSend(const PendingPacket& packet) {
   TRACE_EVENT_ASYNC_BEGIN2("p2p", "Udp::DoSend", this,
                            "id", id_, "size", packet.size);
-  int result = socket_->SendTo(packet.data, packet.size, packet.to,
-                               base::Bind(&P2PSocketHostUdp::OnSend,
-                                          base::Unretained(this)));
+  int result = socket_->SendTo(
+      packet.data.get(),
+      packet.size,
+      packet.to,
+      base::Bind(&P2PSocketHostUdp::OnSend, base::Unretained(this)));
 
   // sendto() may return an error, e.g. if we've received an ICMP Destination
   // Unreachable message. When this happens try sending the same packet again,
   // and just drop it if it fails again.
   if (IsTransientError(result)) {
-    result = socket_->SendTo(packet.data, packet.size, packet.to,
-                             base::Bind(&P2PSocketHostUdp::OnSend,
-                                        base::Unretained(this)));
+    result = socket_->SendTo(
+        packet.data.get(),
+        packet.size,
+        packet.to,
+        base::Bind(&P2PSocketHostUdp::OnSend, base::Unretained(this)));
   }
 
   if (result == net::ERR_IO_PENDING) {
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc
index 3638898..a911c2c 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_socket.cc
+++ b/content/browser/renderer_host/pepper/pepper_tcp_socket.cc
@@ -168,9 +168,10 @@ void PepperTCPSocket::Read(int32 bytes_to_read) {
   }
 
   read_buffer_ = new net::IOBuffer(bytes_to_read);
-  int result = socket_->Read(read_buffer_, bytes_to_read,
-                             base::Bind(&PepperTCPSocket::OnReadCompleted,
-                                        base::Unretained(this)));
+  int result = socket_->Read(
+      read_buffer_.get(),
+      bytes_to_read,
+      base::Bind(&PepperTCPSocket::OnReadCompleted, base::Unretained(this)));
   if (result != net::ERR_IO_PENDING)
     OnReadCompleted(result);
 }
@@ -192,7 +193,8 @@ void PepperTCPSocket::Write(const std::string& data) {
 
   write_buffer_base_ = new net::IOBuffer(data_size);
   memcpy(write_buffer_base_->data(), data.data(), data_size);
-  write_buffer_ = new net::DrainableIOBuffer(write_buffer_base_, data_size);
+  write_buffer_ =
+      new net::DrainableIOBuffer(write_buffer_base_.get(), data_size);
   DoWrite();
 }
 
@@ -291,9 +293,9 @@ bool PepperTCPSocket::GetCertificateFields(
     ppapi::PPB_X509Certificate_Fields* fields) {
   scoped_refptr<net::X509Certificate> cert =
       net::X509Certificate::CreateFromBytes(der, length);
-  if (!cert)
+  if (!cert.get())
     return false;
-  return GetCertificateFields(*cert, fields);
+  return GetCertificateFields(*cert.get(), fields);
 }
 
 void PepperTCPSocket::SendReadACKError() {
@@ -314,8 +316,8 @@ void PepperTCPSocket::SendSSLHandshakeACK(bool succeeded) {
         static_cast<net::SSLClientSocket*>(socket_.get());
     net::SSLInfo ssl_info;
     ssl_socket->GetSSLInfo(&ssl_info);
-    if (ssl_info.cert)
-      GetCertificateFields(*ssl_info.cert, &certificate_fields);
+    if (ssl_info.cert.get())
+      GetCertificateFields(*ssl_info.cert.get(), &certificate_fields);
   }
   manager_->Send(new PpapiMsg_PPBTCPSocket_SSLHandshakeACK(
       routing_id_,
@@ -443,9 +445,10 @@ void PepperTCPSocket::DoWrite() {
   DCHECK(write_buffer_.get());
   DCHECK_GT(write_buffer_->BytesRemaining(), 0);
 
-  int result = socket_->Write(write_buffer_, write_buffer_->BytesRemaining(),
-                              base::Bind(&PepperTCPSocket::OnWriteCompleted,
-                                         base::Unretained(this)));
+  int result = socket_->Write(
+      write_buffer_.get(),
+      write_buffer_->BytesRemaining(),
+      base::Bind(&PepperTCPSocket::OnWriteCompleted, base::Unretained(this)));
   if (result != net::ERR_IO_PENDING)
     OnWriteCompleted(result);
 }
diff --git a/content/browser/renderer_host/pepper/pepper_udp_socket_private_message_filter.cc b/content/browser/renderer_host/pepper/pepper_udp_socket_private_message_filter.cc
index e6563cf..9095710 100644
--- a/content/browser/renderer_host/pepper/pepper_udp_socket_private_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_udp_socket_private_message_filter.cc
@@ -165,7 +165,7 @@ int32_t PepperUDPSocketPrivateMessageFilter::OnMsgRecvFrom(
   if (closed_)
     return PP_ERROR_FAILED;
 
-  if (recvfrom_buffer_)
+  if (recvfrom_buffer_.get())
     return PP_ERROR_INPROGRESS;
   if (num_bytes > ppapi::proxy::UDPSocketPrivateResource::kMaxReadSize) {
     // |num_bytes| value is checked on the plugin side.
@@ -174,9 +174,12 @@ int32_t PepperUDPSocketPrivateMessageFilter::OnMsgRecvFrom(
   }
   recvfrom_buffer_ = new net::IOBuffer(num_bytes);
   int result = socket_->RecvFrom(
-      recvfrom_buffer_, num_bytes, &recvfrom_address_,
+      recvfrom_buffer_.get(),
+      num_bytes,
+      &recvfrom_address_,
       base::Bind(&PepperUDPSocketPrivateMessageFilter::OnRecvFromCompleted,
-                 this, context->MakeReplyMessageContext()));
+                 this,
+                 context->MakeReplyMessageContext()));
   if (result != net::ERR_IO_PENDING)
     OnRecvFromCompleted(context->MakeReplyMessageContext(), result);
   return PP_OK_COMPLETIONPENDING;
@@ -263,7 +266,7 @@ void PepperUDPSocketPrivateMessageFilter::DoSendTo(
     return;
   }
 
-  if (sendto_buffer_) {
+  if (sendto_buffer_.get()) {
     SendSendToError(context, PP_ERROR_INPROGRESS);
     return;
   }
@@ -292,8 +295,11 @@ void PepperUDPSocketPrivateMessageFilter::DoSendTo(
   }
 
   int result = socket_->SendTo(
-      sendto_buffer_, sendto_buffer_->size(), net::IPEndPoint(address, port),
-      base::Bind(&PepperUDPSocketPrivateMessageFilter::OnSendToCompleted, this,
+      sendto_buffer_.get(),
+      sendto_buffer_->size(),
+      net::IPEndPoint(address, port),
+      base::Bind(&PepperUDPSocketPrivateMessageFilter::OnSendToCompleted,
+                 this,
                  context));
   if (result != net::ERR_IO_PENDING)
     OnSendToCompleted(context, result);
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 1e8b640..c684d1b 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -310,7 +310,7 @@ RenderMessageFilter::RenderMessageFilter(
       render_process_id_(render_process_id),
       cpu_usage_(0),
       media_internals_(media_internals) {
-  DCHECK(request_context_);
+  DCHECK(request_context_.get());
 
   render_widget_helper_->Init(render_process_id_, resource_dispatcher_host_);
 }
@@ -468,7 +468,7 @@ void RenderMessageFilter::OnCreateWindow(
 
   // This will clone the sessionStorage for namespace_id_to_clone.
   scoped_refptr<SessionStorageNamespaceImpl> cloned_namespace =
-      new SessionStorageNamespaceImpl(dom_storage_context_,
+      new SessionStorageNamespaceImpl(dom_storage_context_.get(),
                                       params.session_storage_namespace_id);
   *cloned_session_storage_namespace_id = cloned_namespace->id();
 
@@ -478,7 +478,7 @@ void RenderMessageFilter::OnCreateWindow(
                                          route_id,
                                          main_frame_route_id,
                                          surface_id,
-                                         cloned_namespace);
+                                         cloned_namespace.get());
 }
 
 void RenderMessageFilter::OnCreateWidget(int opener_id,
@@ -912,9 +912,11 @@ void RenderMessageFilter::OnCacheableMetadataAvailable(
   const net::RequestPriority kPriority = net::LOW;
   scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(data.size()));
   memcpy(buf->data(), &data.front(), data.size());
-  cache->WriteMetadata(
-      url, kPriority,
-      base::Time::FromDoubleT(expected_response_time), buf, data.size());
+  cache->WriteMetadata(url,
+                       kPriority,
+                       base::Time::FromDoubleT(expected_response_time),
+                       buf.get(),
+                       data.size());
 }
 
 void RenderMessageFilter::OnKeygen(uint32 key_size_index,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index c10a4f3..b5ef5fb 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -217,12 +217,12 @@ class RendererURLRequestContextSelector
 
   virtual net::URLRequestContext* GetRequestContext(
       ResourceType::Type resource_type) OVERRIDE {
-    net::URLRequestContextGetter* request_context = request_context_;
+    net::URLRequestContextGetter* request_context = request_context_.get();
     // If the request has resource type of ResourceType::MEDIA, we use a request
     // context specific to media for handling it because these resources have
     // specific needs for caching.
     if (resource_type == ResourceType::MEDIA)
-      request_context = media_request_context_;
+      request_context = media_request_context_.get();
     return request_context->GetURLRequestContext();
   }
 
@@ -561,7 +561,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
   if (supports_browser_plugin_) {
     scoped_refptr<BrowserPluginMessageFilter> bp_message_filter(
         new BrowserPluginMessageFilter(GetID(), IsGuest()));
-    channel_->AddFilter(bp_message_filter);
+    channel_->AddFilter(bp_message_filter.get());
   }
 
   scoped_refptr<RenderMessageFilter> render_message_filter(
@@ -574,10 +574,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
 #endif
           GetBrowserContext(),
           GetBrowserContext()->GetRequestContextForRenderProcess(GetID()),
-          widget_helper_,
+          widget_helper_.get(),
           media_internals,
           storage_partition_impl_->GetDOMStorageContext()));
-  channel_->AddFilter(render_message_filter);
+  channel_->AddFilter(render_message_filter.get());
   BrowserContext* browser_context = GetBrowserContext();
   ResourceContext* resource_context = browser_context->GetResourceContext();
 
@@ -611,12 +611,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
           GetID(),
           storage_partition_impl_->GetIndexedDBContext()));
   if (IsGuest()) {
-    if (!g_browser_plugin_geolocation_context.Get()) {
+    if (!g_browser_plugin_geolocation_context.Get().get()) {
       g_browser_plugin_geolocation_context.Get() =
           new BrowserPluginGeolocationPermissionContext();
     }
     channel_->AddFilter(GeolocationDispatcherHost::New(
-        GetID(), g_browser_plugin_geolocation_context.Get()));
+        GetID(), g_browser_plugin_geolocation_context.Get().get()));
   } else {
     channel_->AddFilter(GeolocationDispatcherHost::New(
         GetID(), browser_context->GetGeolocationPermissionContext()));
@@ -625,7 +625,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
   channel_->AddFilter(gpu_message_filter_);
 #if defined(ENABLE_WEBRTC)
   peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
-  channel_->AddFilter(peer_connection_tracker_host_);
+  channel_->AddFilter(peer_connection_tracker_host_.get());
   channel_->AddFilter(new MediaStreamDispatcherHost(GetID()));
 #endif
 #if defined(ENABLE_PLUGINS)
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index e6b59ba..73dd8d9 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -188,8 +188,8 @@ RenderViewHostImpl::RenderViewHostImpl(
           static_cast<SessionStorageNamespaceImpl*>(session_storage)),
       save_accessibility_tree_for_testing_(false),
       render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) {
-  DCHECK(session_storage_namespace_);
-  DCHECK(instance_);
+  DCHECK(session_storage_namespace_.get());
+  DCHECK(instance_.get());
   CHECK(delegate_);  // http://crbug.com/82827
 
   if (main_frame_routing_id == MSG_ROUTING_NONE)
@@ -226,7 +226,7 @@ RenderViewHostDelegate* RenderViewHostImpl::GetDelegate() const {
 }
 
 SiteInstance* RenderViewHostImpl::GetSiteInstance() const {
-  return instance_;
+  return instance_.get();
 }
 
 bool RenderViewHostImpl::CreateRenderView(
diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
index edf39ea..58a04ce 100644
--- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
@@ -69,7 +69,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       shell()->web_contents()->GetSiteInstance());
-  EXPECT_TRUE(orig_site_instance != NULL);
+  EXPECT_TRUE(orig_site_instance.get() != NULL);
 
   // Open a same-site link in a new window.
   ShellAddedObserver new_shell_observer;
@@ -137,7 +137,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       shell()->web_contents()->GetSiteInstance());
-  EXPECT_TRUE(orig_site_instance != NULL);
+  EXPECT_TRUE(orig_site_instance.get() != NULL);
 
   // Test clicking a rel=noreferrer + target=blank link.
   ShellAddedObserver new_shell_observer;
@@ -190,7 +190,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       shell()->web_contents()->GetSiteInstance());
-  EXPECT_TRUE(orig_site_instance != NULL);
+  EXPECT_TRUE(orig_site_instance.get() != NULL);
 
   // Test clicking a same-site rel=noreferrer + target=foo link.
   ShellAddedObserver new_shell_observer;
@@ -243,7 +243,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       shell()->web_contents()->GetSiteInstance());
-  EXPECT_TRUE(orig_site_instance != NULL);
+  EXPECT_TRUE(orig_site_instance.get() != NULL);
 
   // Test clicking a target=blank link.
   ShellAddedObserver new_shell_observer;
@@ -291,7 +291,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       shell()->web_contents()->GetSiteInstance());
-  EXPECT_TRUE(orig_site_instance != NULL);
+  EXPECT_TRUE(orig_site_instance.get() != NULL);
 
   // Test clicking a rel=noreferrer link.
   bool success = false;
@@ -359,7 +359,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       shell()->web_contents()->GetSiteInstance());
-  EXPECT_TRUE(orig_site_instance != NULL);
+  EXPECT_TRUE(orig_site_instance.get() != NULL);
 
   // Test clicking a target=foo link.
   ShellAddedObserver new_shell_observer;
@@ -442,7 +442,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) {
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       shell()->web_contents()->GetSiteInstance());
-  EXPECT_TRUE(orig_site_instance != NULL);
+  EXPECT_TRUE(orig_site_instance.get() != NULL);
 
   // Test clicking a target=_blank link.
   ShellAddedObserver new_shell_observer;
@@ -545,10 +545,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   WebContents* opener_contents = shell()->web_contents();
   scoped_refptr<SiteInstance> orig_site_instance(
       opener_contents->GetSiteInstance());
-  EXPECT_TRUE(orig_site_instance != NULL);
-  RenderViewHostManager* opener_manager =
-      static_cast<WebContentsImpl*>(opener_contents)->
-          GetRenderManagerForTesting();
+  EXPECT_TRUE(orig_site_instance.get() != NULL);
+  RenderViewHostManager* opener_manager = static_cast<WebContentsImpl*>(
+      opener_contents)->GetRenderManagerForTesting();
 
   // 1) Open two more windows, one named.  These initially have openers but no
   // reference to each other.  We will later post a message between them.
@@ -595,8 +594,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // We now have three windows.  The opener should have a swapped out RVH
   // for the new SiteInstance, but the _blank window should not.
   EXPECT_EQ(3u, Shell::windows().size());
-  EXPECT_TRUE(opener_manager->GetSwappedOutRenderViewHost(foo_site_instance));
-  EXPECT_FALSE(new_manager->GetSwappedOutRenderViewHost(foo_site_instance));
+  EXPECT_TRUE(
+      opener_manager->GetSwappedOutRenderViewHost(foo_site_instance.get()));
+  EXPECT_FALSE(
+      new_manager->GetSwappedOutRenderViewHost(foo_site_instance.get()));
 
   // 2) Fail to post a message from the foo window to the opener if the target
   // origin is wrong.  We won't see an error, but we can check for the right
@@ -607,7 +608,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
       "    'http://google.com'));",
       &success));
   EXPECT_TRUE(success);
-  ASSERT_FALSE(opener_manager->GetSwappedOutRenderViewHost(orig_site_instance));
+  ASSERT_FALSE(
+      opener_manager->GetSwappedOutRenderViewHost(orig_site_instance.get()));
 
   // 3) Post a message from the foo window to the opener.  The opener will
   // reply, causing the foo window to update its own title.
@@ -619,7 +621,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
       "window.domAutomationController.send(postToOpener('msg','*'));",
       &success));
   EXPECT_TRUE(success);
-  ASSERT_FALSE(opener_manager->GetSwappedOutRenderViewHost(orig_site_instance));
+  ASSERT_FALSE(
+      opener_manager->GetSwappedOutRenderViewHost(orig_site_instance.get()));
   title_observer.Wait();
 
   // We should have received only 1 message in the opener and "foo" tabs,
@@ -653,7 +656,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
   // This postMessage should have created a swapped out RVH for the new
   // SiteInstance in the target=_blank window.
-  EXPECT_TRUE(new_manager->GetSwappedOutRenderViewHost(foo_site_instance));
+  EXPECT_TRUE(
+      new_manager->GetSwappedOutRenderViewHost(foo_site_instance.get()));
 
   // TODO(nasko): Test subframe targeting of postMessage once
   // http://crbug.com/153701 is fixed.
@@ -683,7 +687,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   WebContents* orig_contents = shell()->web_contents();
   scoped_refptr<SiteInstance> orig_site_instance(
       orig_contents->GetSiteInstance());
-  EXPECT_TRUE(orig_site_instance != NULL);
+  EXPECT_TRUE(orig_site_instance.get() != NULL);
 
   // Test clicking a target=foo link.
   ShellAddedObserver new_shell_observer;
@@ -753,7 +757,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       shell()->web_contents()->GetSiteInstance());
-  EXPECT_TRUE(orig_site_instance != NULL);
+  EXPECT_TRUE(orig_site_instance.get() != NULL);
 
   // Test clicking a target=foo link.
   ShellAddedObserver new_shell_observer;
@@ -821,7 +825,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) {
   // Get the original SiteInstance for later comparison.
   scoped_refptr<SiteInstance> orig_site_instance(
       shell()->web_contents()->GetSiteInstance());
-  EXPECT_TRUE(orig_site_instance != NULL);
+  EXPECT_TRUE(orig_site_instance.get() != NULL);
 
   // Load a cross-site page that fails with a 204 error.
   NavigateToURL(shell(), https_server.GetURL("nocontent"));
diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc
index 9d6a4be..f91695c 100644
--- a/content/browser/renderer_host/render_widget_helper.cc
+++ b/content/browser/renderer_host/render_widget_helper.cc
@@ -63,7 +63,7 @@ RenderWidgetHelper::BackingStoreMsgProxy::BackingStoreMsgProxy(
 RenderWidgetHelper::BackingStoreMsgProxy::~BackingStoreMsgProxy() {
   // If the paint message was never dispatched, then we need to let the
   // helper know that we are going away.
-  if (!cancelled_ && helper_)
+  if (!cancelled_ && helper_.get())
     helper_->OnDiscardBackingStoreMsg(this);
 }
 
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index 4a6de28..c12d592 100644
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -392,12 +392,13 @@ IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTest, CopyTwice) {
   base::RunLoop run_loop;
   scoped_refptr<media::VideoFrame> first_output =
       media::VideoFrame::CreateBlackFrame(frame_size());
-  ASSERT_TRUE(first_output);
+  ASSERT_TRUE(first_output.get());
   scoped_refptr<media::VideoFrame> second_output =
       media::VideoFrame::CreateBlackFrame(frame_size());
-  ASSERT_TRUE(second_output);
+  ASSERT_TRUE(second_output.get());
   view->CopyFromCompositingSurfaceToVideoFrame(
-      gfx::Rect(view->GetViewBounds().size()), first_output,
+      gfx::Rect(view->GetViewBounds().size()),
+      first_output,
       base::Bind(&RenderWidgetHostViewBrowserTest::FrameDelivered,
                  base::Unretained(this),
                  base::MessageLoopProxy::current(),
diff --git a/content/browser/renderer_host/smooth_scroll_gesture_controller.cc b/content/browser/renderer_host/smooth_scroll_gesture_controller.cc
index 3e8fcc1..a1f1934 100644
--- a/content/browser/renderer_host/smooth_scroll_gesture_controller.cc
+++ b/content/browser/renderer_host/smooth_scroll_gesture_controller.cc
@@ -30,7 +30,7 @@ SmoothScrollGestureController::~SmoothScrollGestureController() {
 void SmoothScrollGestureController::BeginSmoothScroll(
     RenderWidgetHostViewPort* view,
     const ViewHostMsg_BeginSmoothScroll_Params& params) {
-  if (pending_smooth_scroll_gesture_)
+  if (pending_smooth_scroll_gesture_.get())
     return;
 
   rwh_ = view->GetRenderWidgetHost();
diff --git a/content/browser/renderer_host/socket_stream_host.cc b/content/browser/renderer_host/socket_stream_host.cc
index 405a2b7..2d42089 100644
--- a/content/browser/renderer_host/socket_stream_host.cc
+++ b/content/browser/renderer_host/socket_stream_host.cc
@@ -67,33 +67,33 @@ void SocketStreamHost::Connect(const GURL& url,
 
 bool SocketStreamHost::SendData(const std::vector<char>& data) {
   VLOG(1) << "SocketStreamHost::SendData";
-  return socket_ && socket_->SendData(&data[0], data.size());
+  return socket_.get() && socket_->SendData(&data[0], data.size());
 }
 
 void SocketStreamHost::Close() {
   VLOG(1) << "SocketStreamHost::Close";
-  if (!socket_)
+  if (!socket_.get())
     return;
   socket_->Close();
 }
 
 void SocketStreamHost::CancelWithError(int error) {
   VLOG(1) << "SocketStreamHost::CancelWithError: error=" << error;
-  if (!socket_)
+  if (!socket_.get())
     return;
   socket_->CancelWithError(error);
 }
 
 void SocketStreamHost::CancelWithSSLError(const net::SSLInfo& ssl_info) {
   VLOG(1) << "SocketStreamHost::CancelWithSSLError";
-  if (!socket_)
+  if (!socket_.get())
     return;
   socket_->CancelWithSSLError(ssl_info);
 }
 
 void SocketStreamHost::ContinueDespiteError() {
   VLOG(1) << "SocketStreamHost::ContinueDespiteError";
-  if (!socket_)
+  if (!socket_.get())
     return;
   socket_->ContinueDespiteError();
 }
diff --git a/content/browser/resolve_proxy_msg_helper.cc b/content/browser/resolve_proxy_msg_helper.cc
index 796b070..52d0987 100644
--- a/content/browser/resolve_proxy_msg_helper.cc
+++ b/content/browser/resolve_proxy_msg_helper.cc
@@ -83,7 +83,7 @@ void ResolveProxyMsgHelper::StartPendingRequest() {
   // Verify the request wasn't started yet.
   DCHECK(NULL == req.pac_req);
 
-  if (context_getter_) {
+  if (context_getter_.get()) {
     proxy_service_ = context_getter_->GetURLRequestContext()->proxy_service();
     context_getter_ = NULL;
   }
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
index b6f7d33..56ee6df 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -195,8 +195,8 @@ SiteInstance* SiteInstanceImpl::GetRelatedSiteInstance(const GURL& url) {
 }
 
 bool SiteInstanceImpl::IsRelatedSiteInstance(const SiteInstance* instance) {
-  return browsing_instance_ ==
-      static_cast<const SiteInstanceImpl*>(instance)->browsing_instance_;
+  return browsing_instance_.get() == static_cast<const SiteInstanceImpl*>(
+                                         instance)->browsing_instance_.get();
 }
 
 bool SiteInstanceImpl::HasWrongProcessForURL(const GURL& url) {
diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc
index ac0ca0b..7e807bd 100644
--- a/content/browser/site_instance_impl_unittest.cc
+++ b/content/browser/site_instance_impl_unittest.cc
@@ -408,7 +408,7 @@ TEST_F(SiteInstanceTest, OneSiteInstancePerSite) {
       static_cast<SiteInstanceImpl*>(
           browsing_instance->GetSiteInstanceForURL(url_b1)));
   EXPECT_NE(site_instance_a1.get(), site_instance_b1.get());
-  EXPECT_TRUE(site_instance_a1->IsRelatedSiteInstance(site_instance_b1));
+  EXPECT_TRUE(site_instance_a1->IsRelatedSiteInstance(site_instance_b1.get()));
 
   // Getting the new SiteInstance from the BrowsingInstance and from another
   // SiteInstance in the BrowsingInstance should give the same result.
@@ -431,7 +431,8 @@ TEST_F(SiteInstanceTest, OneSiteInstancePerSite) {
       static_cast<SiteInstanceImpl*>(
           browsing_instance2->GetSiteInstanceForURL(url_a2)));
   EXPECT_NE(site_instance_a1.get(), site_instance_a2_2.get());
-  EXPECT_FALSE(site_instance_a1->IsRelatedSiteInstance(site_instance_a2_2));
+  EXPECT_FALSE(
+      site_instance_a1->IsRelatedSiteInstance(site_instance_a2_2.get()));
 
   // The two SiteInstances for http://google.com should not use the same process
   // if process-per-site is not enabled.
@@ -482,7 +483,7 @@ TEST_F(SiteInstanceTest, OneSiteInstancePerSiteInBrowserContext) {
       static_cast<SiteInstanceImpl*>(
           browsing_instance->GetSiteInstanceForURL(url_b1)));
   EXPECT_NE(site_instance_a1.get(), site_instance_b1.get());
-  EXPECT_TRUE(site_instance_a1->IsRelatedSiteInstance(site_instance_b1));
+  EXPECT_TRUE(site_instance_a1->IsRelatedSiteInstance(site_instance_b1.get()));
 
   // Getting the new SiteInstance from the BrowsingInstance and from another
   // SiteInstance in the BrowsingInstance should give the same result.
diff --git a/content/browser/speech/endpointer/endpointer_unittest.cc b/content/browser/speech/endpointer/endpointer_unittest.cc
index ed5a1fe..306a5ee 100644
--- a/content/browser/speech/endpointer/endpointer_unittest.cc
+++ b/content/browser/speech/endpointer/endpointer_unittest.cc
@@ -123,7 +123,7 @@ class EndpointerFrameProcessor : public FrameProcessor {
                                 int frame_size) OVERRIDE {
     scoped_refptr<AudioChunk> frame(
         new AudioChunk(reinterpret_cast<uint8*>(samples), kFrameSize * 2, 2));
-    endpointer_->ProcessAudio(*frame, NULL);
+    endpointer_->ProcessAudio(*frame.get(), NULL);
     int64 ep_time;
     return endpointer_->Status(&ep_time);
   }
diff --git a/content/browser/speech/google_one_shot_remote_engine.cc b/content/browser/speech/google_one_shot_remote_engine.cc
index 113a939..00a83e4 100644
--- a/content/browser/speech/google_one_shot_remote_engine.cc
+++ b/content/browser/speech/google_one_shot_remote_engine.cc
@@ -164,7 +164,7 @@ void GoogleOneShotRemoteEngine::StartRecognition() {
   DCHECK(!url_fetcher_.get());
   std::string lang_param = config_.language;
 
-  if (lang_param.empty() && url_context_) {
+  if (lang_param.empty() && url_context_.get()) {
     // If no language is provided then we use the first from the accepted
     // language list. If this list is empty then it defaults to "en-US".
     // Example of the contents of this list: "es,en-GB;q=0.8", ""
@@ -211,7 +211,7 @@ void GoogleOneShotRemoteEngine::StartRecognition() {
                                              net::URLFetcher::POST,
                                              this));
   url_fetcher_->SetChunkedUpload(encoder_->mime_type());
-  url_fetcher_->SetRequestContext(url_context_);
+  url_fetcher_->SetRequestContext(url_context_.get());
   url_fetcher_->SetReferrer(config_.origin_url);
 
   // The speech recognition API does not require user identification as part
@@ -249,7 +249,7 @@ void GoogleOneShotRemoteEngine::AudioChunksEnded() {
       new AudioChunk(reinterpret_cast<uint8*>(&samples[0]),
                      samples.size() * sizeof(int16),
                      encoder_->bits_per_sample() / 8));
-  encoder_->Encode(*dummy_chunk);
+  encoder_->Encode(*dummy_chunk.get());
   encoder_->Flush();
   scoped_refptr<AudioChunk> encoded_dummy_data(
       encoder_->GetEncodedDataAndClear());
diff --git a/content/browser/speech/google_one_shot_remote_engine_unittest.cc b/content/browser/speech/google_one_shot_remote_engine_unittest.cc
index 7f06f86..cd6d418 100644
--- a/content/browser/speech/google_one_shot_remote_engine_unittest.cc
+++ b/content/browser/speech/google_one_shot_remote_engine_unittest.cc
@@ -59,7 +59,7 @@ void GoogleOneShotRemoteEngineTest::CreateAndTestRequest(
                      2 /* bytes per sample */));
   client.set_delegate(this);
   client.StartRecognition();
-  client.TakeAudioChunk(*dummy_audio_chunk);
+  client.TakeAudioChunk(*dummy_audio_chunk.get());
   client.AudioChunksEnded();
   net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
diff --git a/content/browser/speech/google_streaming_remote_engine.cc b/content/browser/speech/google_streaming_remote_engine.cc
index d86c180..514a949 100644
--- a/content/browser/speech/google_streaming_remote_engine.cc
+++ b/content/browser/speech/google_streaming_remote_engine.cc
@@ -327,7 +327,7 @@ GoogleStreamingRemoteEngine::ConnectBothStreams(const FSMEventArgs&) {
 
   downstream_fetcher_.reset(URLFetcher::Create(
       kDownstreamUrlFetcherIdForTests, downstream_url, URLFetcher::GET, this));
-  downstream_fetcher_->SetRequestContext(url_context_);
+  downstream_fetcher_->SetRequestContext(url_context_.get());
   downstream_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
                                     net::LOAD_DO_NOT_SEND_COOKIES |
                                     net::LOAD_DO_NOT_SEND_AUTH_DATA);
@@ -367,7 +367,7 @@ GoogleStreamingRemoteEngine::ConnectBothStreams(const FSMEventArgs&) {
   upstream_fetcher_.reset(URLFetcher::Create(
       kUpstreamUrlFetcherIdForTests, upstream_url, URLFetcher::POST, this));
   upstream_fetcher_->SetChunkedUpload(encoder_->mime_type());
-  upstream_fetcher_->SetRequestContext(url_context_);
+  upstream_fetcher_->SetRequestContext(url_context_.get());
   upstream_fetcher_->SetReferrer(config_.origin_url);
   upstream_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
                                   net::LOAD_DO_NOT_SEND_COOKIES |
@@ -382,7 +382,7 @@ GoogleStreamingRemoteEngine::TransmitAudioUpstream(
     const FSMEventArgs& event_args) {
   DCHECK(upstream_fetcher_.get());
   DCHECK(event_args.audio_data.get());
-  const AudioChunk& audio = *(event_args.audio_data);
+  const AudioChunk& audio = *(event_args.audio_data.get());
 
   DCHECK_EQ(audio.bytes_per_sample(), config_.audio_num_bits_per_sample / 8);
   encoder_->Encode(audio);
@@ -494,7 +494,7 @@ GoogleStreamingRemoteEngine::CloseUpstreamAndWaitForResults(
       new AudioChunk(reinterpret_cast<uint8*>(&samples[0]),
                      samples.size() * sizeof(short),
                      encoder_->bits_per_sample() / 8);
-  encoder_->Encode(*dummy_chunk);
+  encoder_->Encode(*dummy_chunk.get());
   encoder_->Flush();
   scoped_refptr<AudioChunk> encoded_dummy_data =
       encoder_->GetEncodedDataAndClear();
@@ -554,7 +554,7 @@ GoogleStreamingRemoteEngine::NotFeasible(const FSMEventArgs& event_args) {
 
 std::string GoogleStreamingRemoteEngine::GetAcceptedLanguages() const {
   std::string langs = config_.language;
-  if (langs.empty() && url_context_) {
+  if (langs.empty() && url_context_.get()) {
     // If no language is provided then we use the first from the accepted
     // language list. If this list is empty then it defaults to "en-US".
     // Example of the contents of this list: "es,en-GB;q=0.8", ""
diff --git a/content/browser/speech/google_streaming_remote_engine_unittest.cc b/content/browser/speech/google_streaming_remote_engine_unittest.cc
index cd23d4b..c1fa006 100644
--- a/content/browser/speech/google_streaming_remote_engine_unittest.cc
+++ b/content/browser/speech/google_streaming_remote_engine_unittest.cc
@@ -380,7 +380,7 @@ void GoogleStreamingRemoteEngineTest::InjectDummyAudioChunk() {
                      sizeof(dummy_audio_buffer_data),
                      2 /* bytes per sample */));
   DCHECK(engine_under_test_.get());
-  engine_under_test_->TakeAudioChunk(*dummy_audio_chunk);
+  engine_under_test_->TakeAudioChunk(*dummy_audio_chunk.get());
 }
 
 size_t GoogleStreamingRemoteEngineTest::UpstreamChunksUploadedFromLastCall() {
diff --git a/content/browser/speech/input_tag_speech_dispatcher_host.cc b/content/browser/speech/input_tag_speech_dispatcher_host.cc
index b064fbc..8c4acdb 100644
--- a/content/browser/speech/input_tag_speech_dispatcher_host.cc
+++ b/content/browser/speech/input_tag_speech_dispatcher_host.cc
@@ -128,7 +128,7 @@ void InputTagSpeechDispatcherHost::StartRecognitionOnIO(
   config.origin_url = params.origin_url;
   config.initial_context = context;
   config.url_request_context_getter = url_request_context_getter_.get();
-  if (recognition_preferences_) {
+  if (recognition_preferences_.get()) {
     config.filter_profanities = recognition_preferences_->FilterProfanities();
   } else {
     config.filter_profanities = false;
diff --git a/content/browser/speech/speech_recognition_dispatcher_host.cc b/content/browser/speech/speech_recognition_dispatcher_host.cc
index 2dc993a..7f20ca4 100644
--- a/content/browser/speech/speech_recognition_dispatcher_host.cc
+++ b/content/browser/speech/speech_recognition_dispatcher_host.cc
@@ -79,7 +79,7 @@ void SpeechRecognitionDispatcherHost::OnStartRequest(
   config.origin_url = params.origin_url;
   config.initial_context = context;
   config.url_request_context_getter = context_getter_.get();
-  if (recognition_preferences_) {
+  if (recognition_preferences_.get()) {
     config.filter_profanities = recognition_preferences_->FilterProfanities();
   } else {
     config.filter_profanities = false;
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc
index beae421..0b77003 100644
--- a/content/browser/speech/speech_recognition_manager_impl.cc
+++ b/content/browser/speech/speech_recognition_manager_impl.cc
@@ -118,10 +118,10 @@ int SpeechRecognitionManagerImpl::CreateSession(
   SpeechRecognitionEngine* google_remote_engine;
   if (config.is_legacy_api) {
     google_remote_engine =
-        new GoogleOneShotRemoteEngine(config.url_request_context_getter);
+        new GoogleOneShotRemoteEngine(config.url_request_context_getter.get());
   } else {
-    google_remote_engine =
-        new GoogleStreamingRemoteEngine(config.url_request_context_getter);
+    google_remote_engine = new GoogleStreamingRemoteEngine(
+        config.url_request_context_getter.get());
   }
 
   google_remote_engine->SetConfig(remote_engine_config);
@@ -602,7 +602,7 @@ void SpeechRecognitionManagerImpl::ResetCapturingSessionId(
 }
 
 void SpeechRecognitionManagerImpl::SessionDelete(const Session& session) {
-  DCHECK(session.recognizer == NULL || !session.recognizer->IsActive());
+  DCHECK(session.recognizer.get() == NULL || !session.recognizer->IsActive());
   if (primary_session_id_ == session.id)
     primary_session_id_ = kSessionIDInvalid;
   sessions_.erase(session.id);
diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc
index c1789a7..9216478 100644
--- a/content/browser/speech/speech_recognizer_impl.cc
+++ b/content/browser/speech/speech_recognizer_impl.cc
@@ -151,9 +151,9 @@ SpeechRecognizerImpl::recognition_engine() const {
 
 SpeechRecognizerImpl::~SpeechRecognizerImpl() {
   endpointer_.EndSession();
-  if (audio_controller_) {
-    audio_controller_->Close(base::Bind(&KeepAudioControllerRefcountedForDtor,
-                                        audio_controller_));
+  if (audio_controller_.get()) {
+    audio_controller_->Close(
+        base::Bind(&KeepAudioControllerRefcountedForDtor, audio_controller_));
   }
 }
 
@@ -225,7 +225,7 @@ void SpeechRecognizerImpl::DispatchEvent(const FSMEventArgs& event_args) {
 
   if (event_args.event == EVENT_AUDIO_DATA) {
     DCHECK(event_args.audio_data.get() != NULL);
-    ProcessAudioPipeline(*event_args.audio_data);
+    ProcessAudioPipeline(*event_args.audio_data.get());
   }
 
   // The audio pipeline must be processed before the event dispatch, otherwise
@@ -439,7 +439,7 @@ SpeechRecognizerImpl::StartRecognitionEngine(const FSMEventArgs& event_args) {
   // This is a little hack, since TakeAudioChunk() is already called by
   // ProcessAudioPipeline(). It is the best tradeoff, unless we allow dropping
   // the first audio chunk captured after opening the audio device.
-  recognition_engine_->TakeAudioChunk(*(event_args.audio_data));
+  recognition_engine_->TakeAudioChunk(*(event_args.audio_data.get()));
   return STATE_ESTIMATING_ENVIRONMENT;
 }
 
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc
index 1180269..3340334f 100644
--- a/content/browser/ssl/ssl_client_auth_handler.cc
+++ b/content/browser/ssl/ssl_client_auth_handler.cc
@@ -86,8 +86,10 @@ void SSLClientAuthHandler::DoCertificateSelected(net::X509Certificate* cert) {
 void SSLClientAuthHandler::DoSelectCertificate(
     int render_process_host_id, int render_view_host_id) {
   GetContentClient()->browser()->SelectClientCertificate(
-      render_process_host_id, render_view_host_id, http_network_session_,
-      cert_request_info_,
+      render_process_host_id,
+      render_view_host_id,
+      http_network_session_,
+      cert_request_info_.get(),
       base::Bind(&SSLClientAuthHandler::CertificateSelected, this));
 }
 
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index 1b9d60c..c425fd9 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -44,9 +44,8 @@ SSLPolicy::SSLPolicy(SSLPolicyBackend* backend)
 
 void SSLPolicy::OnCertError(SSLCertErrorHandler* handler) {
   // First we check if we know the policy for this error.
-  net::CertPolicy::Judgment judgment =
-      backend_->QueryPolicy(handler->ssl_info().cert,
-                            handler->request_url().host());
+  net::CertPolicy::Judgment judgment = backend_->QueryPolicy(
+      handler->ssl_info().cert.get(), handler->request_url().host());
 
   if (judgment == net::CertPolicy::ALLOWED) {
     handler->ContinueRequest();
@@ -173,7 +172,7 @@ void SSLPolicy::OnAllowCertificate(scoped_refptr<SSLCertErrorHandler> handler,
     // While AllowCertForHost() executes synchronously on this thread,
     // ContinueRequest() gets posted to a different thread. Calling
     // AllowCertForHost() first ensures deterministic ordering.
-    backend_->AllowCertForHost(handler->ssl_info().cert,
+    backend_->AllowCertForHost(handler->ssl_info().cert.get(),
                                handler->request_url().host());
     handler->ContinueRequest();
   } else {
@@ -182,7 +181,7 @@ void SSLPolicy::OnAllowCertificate(scoped_refptr<SSLCertErrorHandler> handler,
     // While DenyCertForHost() executes synchronously on this thread,
     // CancelRequest() gets posted to a different thread. Calling
     // DenyCertForHost() first ensures deterministic ordering.
-    backend_->DenyCertForHost(handler->ssl_info().cert,
+    backend_->DenyCertForHost(handler->ssl_info().cert.get(),
                               handler->request_url().host());
     handler->CancelRequest();
   }
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index dff2664..502d87e 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -231,12 +231,12 @@ StoragePartitionImpl* StoragePartitionImpl::Create(
       new ChromeAppCacheService(quota_manager->proxy());
 
   return new StoragePartitionImpl(partition_path,
-                                  quota_manager,
-                                  appcache_service,
-                                  filesystem_context,
-                                  database_tracker,
-                                  dom_storage_context,
-                                  indexed_db_context);
+                                  quota_manager.get(),
+                                  appcache_service.get(),
+                                  filesystem_context.get(),
+                                  database_tracker.get(),
+                                  dom_storage_context.get(),
+                                  indexed_db_context.get());
 }
 
 base::FilePath StoragePartitionImpl::GetPath() {
@@ -244,36 +244,36 @@ base::FilePath StoragePartitionImpl::GetPath() {
 }
 
 net::URLRequestContextGetter* StoragePartitionImpl::GetURLRequestContext() {
-  return url_request_context_;
+  return url_request_context_.get();
 }
 
 net::URLRequestContextGetter*
 StoragePartitionImpl::GetMediaURLRequestContext() {
-  return media_url_request_context_;
+  return media_url_request_context_.get();
 }
 
 quota::QuotaManager* StoragePartitionImpl::GetQuotaManager() {
-  return quota_manager_;
+  return quota_manager_.get();
 }
 
 ChromeAppCacheService* StoragePartitionImpl::GetAppCacheService() {
-  return appcache_service_;
+  return appcache_service_.get();
 }
 
 fileapi::FileSystemContext* StoragePartitionImpl::GetFileSystemContext() {
-  return filesystem_context_;
+  return filesystem_context_.get();
 }
 
 webkit_database::DatabaseTracker* StoragePartitionImpl::GetDatabaseTracker() {
-  return database_tracker_;
+  return database_tracker_.get();
 }
 
 DOMStorageContextImpl* StoragePartitionImpl::GetDOMStorageContext() {
-  return dom_storage_context_;
+  return dom_storage_context_.get();
 }
 
 IndexedDBContextImpl* StoragePartitionImpl::GetIndexedDBContext() {
-  return indexed_db_context_;
+  return indexed_db_context_.get();
 }
 
 void StoragePartitionImpl::AsyncClearDataForOrigin(
diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc
index 400c3b1..eae8422 100644
--- a/content/browser/storage_partition_impl_map.cc
+++ b/content/browser/storage_partition_impl_map.cc
@@ -63,8 +63,8 @@ class BlobProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
     if (!webkit_blob_protocol_handler_impl_) {
       webkit_blob_protocol_handler_impl_.reset(
           new WebKitBlobProtocolHandlerImpl(blob_storage_context_->controller(),
-                                            stream_context_,
-                                            file_system_context_));
+                                            stream_context_.get(),
+                                            file_system_context_.get()));
     }
     return webkit_blob_protocol_handler_impl_->MaybeCreateJob(request,
                                                               network_delegate);
@@ -93,7 +93,7 @@ class BlobProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
         net::NetworkDelegate* network_delegate) const OVERRIDE {
       scoped_refptr<Stream> stream =
           stream_context_->registry()->GetStream(request->url());
-      if (stream)
+      if (stream.get())
         return new StreamURLRequestJob(request, network_delegate, stream);
 
       return webkit_blob::BlobProtocolHandler::MaybeCreateJob(
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;
     }
diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc
index f14578e..e7f1a7d 100644
--- a/content/browser/tracing/tracing_ui.cc
+++ b/content/browser/tracing/tracing_ui.cc
@@ -157,7 +157,7 @@ TracingMessageHandler::TracingMessageHandler()
 }
 
 TracingMessageHandler::~TracingMessageHandler() {
-  if (select_trace_file_dialog_)
+  if (select_trace_file_dialog_.get())
     select_trace_file_dialog_->ListenerDestroyed();
 
   // If we are the current subscriber, this will result in ending tracing.
@@ -310,7 +310,7 @@ void TracingMessageHandler::FileSelectionCanceled(void* params) {
 
 void TracingMessageHandler::OnLoadTraceFile(const base::ListValue* list) {
   // Only allow a single dialog at a time.
-  if (select_trace_file_dialog_)
+  if (select_trace_file_dialog_.get())
     return;
   select_trace_file_dialog_type_ = ui::SelectFileDialog::SELECT_OPEN_FILE;
   select_trace_file_dialog_ = ui::SelectFileDialog::Create(
@@ -360,7 +360,7 @@ void TracingMessageHandler::LoadTraceFileComplete(string16* contents,
 
 void TracingMessageHandler::OnSaveTraceFile(const base::ListValue* list) {
   // Only allow a single dialog at a time.
-  if (select_trace_file_dialog_)
+  if (select_trace_file_dialog_.get())
     return;
 
   DCHECK(list->GetSize() == 1);
diff --git a/content/browser/web_contents/interstitial_page_impl.cc b/content/browser/web_contents/interstitial_page_impl.cc
index 02d3e5a..6543051 100644
--- a/content/browser/web_contents/interstitial_page_impl.cc
+++ b/content/browser/web_contents/interstitial_page_impl.cc
@@ -490,15 +490,19 @@ RenderViewHost* InterstitialPageImpl::CreateRenderViewHost() {
   scoped_refptr<SiteInstance> site_instance =
       SiteInstance::Create(browser_context);
   DOMStorageContextImpl* dom_storage_context =
-      static_cast<DOMStorageContextImpl*>(
-          BrowserContext::GetStoragePartition(
-              browser_context, site_instance)->GetDOMStorageContext());
+      static_cast<DOMStorageContextImpl*>(BrowserContext::GetStoragePartition(
+          browser_context, site_instance.get())->GetDOMStorageContext());
   SessionStorageNamespaceImpl* session_storage_namespace_impl =
       new SessionStorageNamespaceImpl(dom_storage_context);
 
-  RenderViewHostImpl* render_view_host = new RenderViewHostImpl(
-      site_instance, this, this, MSG_ROUTING_NONE, MSG_ROUTING_NONE, false,
-      session_storage_namespace_impl);
+  RenderViewHostImpl* render_view_host =
+      new RenderViewHostImpl(site_instance.get(),
+                             this,
+                             this,
+                             MSG_ROUTING_NONE,
+                             MSG_ROUTING_NONE,
+                             false,
+                             session_storage_namespace_impl);
   web_contents_->RenderViewForInterstitialPageCreated(render_view_host);
   return render_view_host;
 }
diff --git a/content/browser/web_contents/navigation_controller_impl.cc b/content/browser/web_contents/navigation_controller_impl.cc
index 82dc3af..b8b3b7c 100644
--- a/content/browser/web_contents/navigation_controller_impl.cc
+++ b/content/browser/web_contents/navigation_controller_impl.cc
@@ -667,7 +667,7 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) {
     case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST:
       entry->SetHasPostData(true);
       entry->SetBrowserInitiatedPostData(
-          params.browser_initiated_post_data);
+          params.browser_initiated_post_data.get());
       break;
     case LOAD_TYPE_DATA:
       entry->SetBaseURLForDataURL(params.base_url_for_data_url);
diff --git a/content/browser/web_contents/navigation_controller_impl_unittest.cc b/content/browser/web_contents/navigation_controller_impl_unittest.cc
index 03f56a6..9151aa0 100644
--- a/content/browser/web_contents/navigation_controller_impl_unittest.cc
+++ b/content/browser/web_contents/navigation_controller_impl_unittest.cc
@@ -112,7 +112,7 @@ class MockScreenshotManager : public content::WebContentsScreenshotManager {
   virtual void OnScreenshotSet(content::NavigationEntryImpl* entry) OVERRIDE {
     encoding_screenshot_in_progress_ = false;
     WebContentsScreenshotManager::OnScreenshotSet(entry);
-    if (message_loop_runner_)
+    if (message_loop_runner_.get())
       message_loop_runner_->Quit();
   }
 
diff --git a/content/browser/web_contents/navigation_entry_impl.cc b/content/browser/web_contents/navigation_entry_impl.cc
index 727092f..92b5a48 100644
--- a/content/browser/web_contents/navigation_entry_impl.cc
+++ b/content/browser/web_contents/navigation_entry_impl.cc
@@ -314,7 +314,7 @@ void NavigationEntryImpl::ClearExtraData(const std::string& key) {
 void NavigationEntryImpl::SetScreenshotPNGData(
     scoped_refptr<base::RefCountedBytes> png_data) {
   screenshot_ = png_data;
-  if (screenshot_)
+  if (screenshot_.get())
     UMA_HISTOGRAM_MEMORY_KB("Overscroll.ScreenshotSize", screenshot_->size());
 }
 
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index fabd43a..81c00b1 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -272,8 +272,8 @@ WebContents* WebContents::CreateWithSessionStorage(
            session_storage_namespace_map.begin();
        it != session_storage_namespace_map.end();
        ++it) {
-    new_contents->GetController().SetSessionStorageNamespace(it->first,
-                                                             it->second);
+    new_contents->GetController()
+        .SetSessionStorageNamespace(it->first, it->second.get());
   }
 
   new_contents->Init(params);
@@ -1415,9 +1415,8 @@ void WebContentsImpl::CreateNewWindow(
       GetContentClient()->browser()->
           GetStoragePartitionIdForSite(GetBrowserContext(),
                                        site_instance->GetSiteURL());
-  StoragePartition* partition =
-      BrowserContext::GetStoragePartition(GetBrowserContext(),
-                                          site_instance);
+  StoragePartition* partition = BrowserContext::GetStoragePartition(
+      GetBrowserContext(), site_instance.get());
   DOMStorageContextImpl* dom_storage_context =
       static_cast<DOMStorageContextImpl*>(partition->GetDOMStorageContext());
   SessionStorageNamespaceImpl* session_storage_namespace_impl =
@@ -1426,7 +1425,7 @@ void WebContentsImpl::CreateNewWindow(
   new_contents->GetController().SetSessionStorageNamespace(
       partition_id,
       session_storage_namespace);
-  CreateParams create_params(GetBrowserContext(), site_instance);
+  CreateParams create_params(GetBrowserContext(), site_instance.get());
   create_params.routing_id = route_id;
   create_params.main_frame_routing_id = main_frame_route_id;
   if (!is_guest) {
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index 657950d..3d5dbed 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -338,19 +338,19 @@ TEST_F(WebContentsImplTest, UpdateMaxPageID) {
   // Starts at -1.
   EXPECT_EQ(-1, contents()->GetMaxPageID());
   EXPECT_EQ(-1, contents()->GetMaxPageIDForSiteInstance(instance1));
-  EXPECT_EQ(-1, contents()->GetMaxPageIDForSiteInstance(instance2));
+  EXPECT_EQ(-1, contents()->GetMaxPageIDForSiteInstance(instance2.get()));
 
   // Make sure max_page_id_ is monotonically increasing per SiteInstance.
   contents()->UpdateMaxPageID(3);
   contents()->UpdateMaxPageID(1);
   EXPECT_EQ(3, contents()->GetMaxPageID());
   EXPECT_EQ(3, contents()->GetMaxPageIDForSiteInstance(instance1));
-  EXPECT_EQ(-1, contents()->GetMaxPageIDForSiteInstance(instance2));
+  EXPECT_EQ(-1, contents()->GetMaxPageIDForSiteInstance(instance2.get()));
 
-  contents()->UpdateMaxPageIDForSiteInstance(instance2, 7);
+  contents()->UpdateMaxPageIDForSiteInstance(instance2.get(), 7);
   EXPECT_EQ(3, contents()->GetMaxPageID());
   EXPECT_EQ(3, contents()->GetMaxPageIDForSiteInstance(instance1));
-  EXPECT_EQ(7, contents()->GetMaxPageIDForSiteInstance(instance2));
+  EXPECT_EQ(7, contents()->GetMaxPageIDForSiteInstance(instance2.get()));
 }
 
 // Test simple same-SiteInstance navigation.
diff --git a/content/browser/web_contents/web_drag_source_gtk.cc b/content/browser/web_contents/web_drag_source_gtk.cc
index c1425fa..55ebd6e 100644
--- a/content/browser/web_contents/web_drag_source_gtk.cc
+++ b/content/browser/web_contents/web_drag_source_gtk.cc
@@ -256,7 +256,7 @@ void WebDragSourceGtk::OnDragDataGet(GtkWidget* sender,
                     web_contents_->GetEncoding(),
                     web_contents_);
             drag_file_downloader->Start(
-                new PromiseFileFinalizer(drag_file_downloader));
+                new PromiseFileFinalizer(drag_file_downloader.get()));
 
             // Set the status code to success.
             status_code = 'S';
diff --git a/content/browser/webui/shared_resources_data_source.cc b/content/browser/webui/shared_resources_data_source.cc
index fc390b2..23cdc3d 100644
--- a/content/browser/webui/shared_resources_data_source.cc
+++ b/content/browser/webui/shared_resources_data_source.cc
@@ -48,7 +48,7 @@ void SharedResourcesDataSource::StartDataRequest(
   scoped_refptr<base::RefCountedStaticMemory> bytes(
       content::GetContentClient()->GetDataResourceBytes(idr));
 
-  callback.Run(bytes);
+  callback.Run(bytes.get());
 }
 
 std::string SharedResourcesDataSource::GetMimeType(
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc
index ab964d0..4284f0e 100644
--- a/content/browser/webui/url_data_manager_backend.cc
+++ b/content/browser/webui/url_data_manager_backend.cc
@@ -246,7 +246,7 @@ int URLRequestChromeJob::GetResponseCode() const {
 }
 
 void URLRequestChromeJob::GetResponseInfo(net::HttpResponseInfo* info) {
-  DCHECK(!info->headers);
+  DCHECK(!info->headers.get());
   // Set the headers so that requests serviced by ChromeURLDataManager return a
   // status code of 200. Without this they return a 0, which makes the status
   // indistiguishable from other error types. Instant relies on getting a 200.
@@ -283,9 +283,9 @@ void URLRequestChromeJob::DataAvailable(base::RefCountedMemory* bytes) {
 
     data_ = bytes;
     int bytes_read;
-    if (pending_buf_) {
+    if (pending_buf_.get()) {
       CHECK(pending_buf_->data());
-      CompleteRead(pending_buf_, pending_buf_size_, &bytes_read);
+      CompleteRead(pending_buf_.get(), pending_buf_size_, &bytes_read);
       pending_buf_ = NULL;
       NotifyReadComplete(bytes_read);
     }
@@ -298,7 +298,7 @@ void URLRequestChromeJob::DataAvailable(base::RefCountedMemory* bytes) {
 
 bool URLRequestChromeJob::ReadRawData(net::IOBuffer* buf, int buf_size,
                                       int* bytes_read) {
-  if (!data_) {
+  if (!data_.get()) {
     SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
     DCHECK(!pending_buf_.get());
     CHECK(buf->data());
@@ -492,7 +492,7 @@ bool URLDataManagerBackend::StartRequest(const net::URLRequest* request,
   if (i == data_sources_.end())
     return false;
 
-  URLDataSourceImpl* source = i->second;
+  URLDataSourceImpl* source = i->second.get();
 
   if (!source->source()->ShouldServiceRequest(request))
     return false;
diff --git a/content/browser/webui/url_data_source_impl.cc b/content/browser/webui/url_data_source_impl.cc
index d206207..2d89439 100644
--- a/content/browser/webui/url_data_source_impl.cc
+++ b/content/browser/webui/url_data_source_impl.cc
@@ -53,7 +53,7 @@ void URLDataSourceImpl::SendResponseOnIOThread(
     scoped_refptr<base::RefCountedMemory> bytes) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (backend_)
-    backend_->DataAvailable(request_id, bytes);
+    backend_->DataAvailable(request_id, bytes.get());
 }
 
 }  // namespace content
diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc
index 7ca34d2..e3c443a 100644
--- a/content/browser/webui/web_ui_data_source_impl.cc
+++ b/content/browser/webui/web_ui_data_source_impl.cc
@@ -213,7 +213,7 @@ void WebUIDataSourceImpl::SendFromResourceBundle(
     const URLDataSource::GotDataCallback& callback, int idr) {
   scoped_refptr<base::RefCountedStaticMemory> response(
       GetContentClient()->GetDataResourceBytes(idr));
-  callback.Run(response);
+  callback.Run(response.get());
 }
 
 }  // namespace content
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index 14cf9ea..e22334a 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -247,10 +247,9 @@ void WorkerProcessHost::CreateMessageFilters(int render_process_id) {
       render_process_id, resource_context_, partition_,
       base::Bind(&WorkerServiceImpl::next_worker_route_id,
                  base::Unretained(WorkerServiceImpl::GetInstance())));
-  process_->GetHost()->AddFilter(worker_message_filter_);
+  process_->GetHost()->AddFilter(worker_message_filter_.get());
   process_->GetHost()->AddFilter(new AppCacheDispatcherHost(
-      partition_.appcache_service(),
-      process_->GetData().id));
+      partition_.appcache_service(), process_->GetData().id));
   process_->GetHost()->AddFilter(new FileAPIMessageFilter(
       process_->GetData().id,
       url_request_context,
@@ -310,7 +309,7 @@ bool WorkerProcessHost::FilterMessage(const IPC::Message& message,
                                       WorkerMessageFilter* filter) {
   for (Instances::iterator i = instances_.begin(); i != instances_.end(); ++i) {
     if (!i->closed() && i->HasFilter(filter, message.routing_id())) {
-      RelayMessage(message, worker_message_filter_, i->worker_route_id());
+      RelayMessage(message, worker_message_filter_.get(), i->worker_route_id());
       return true;
     }
   }
diff --git a/content/browser/worker_host/worker_process_host.h b/content/browser/worker_host/worker_process_host.h
index 4a86b86..f44b49b 100644
--- a/content/browser/worker_host/worker_process_host.h
+++ b/content/browser/worker_host/worker_process_host.h
@@ -106,7 +106,7 @@ class WorkerProcessHost : public BrowserChildProcessHostDelegate,
       return main_resource_appcache_id_;
     }
     WorkerDocumentSet* worker_document_set() const {
-      return worker_document_set_;
+      return worker_document_set_.get();
     }
     ResourceContext* resource_context() const {
       return resource_context_;
diff --git a/content/browser/worker_host/worker_storage_partition.cc b/content/browser/worker_host/worker_storage_partition.cc
index c7ecf8e..2c91057 100644
--- a/content/browser/worker_host/worker_storage_partition.cc
+++ b/content/browser/worker_host/worker_storage_partition.cc
@@ -45,13 +45,14 @@ const WorkerStoragePartition& WorkerStoragePartition::operator=(
 
 bool WorkerStoragePartition::Equals(
     const WorkerStoragePartition& other) const {
-  return url_request_context_ == other.url_request_context_ &&
-         media_url_request_context_ == other.media_url_request_context_ &&
-         appcache_service_ == other.appcache_service_ &&
-         quota_manager_ == other.quota_manager_ &&
-         filesystem_context_ == other.filesystem_context_ &&
-         database_tracker_ == other.database_tracker_ &&
-         indexed_db_context_ == other.indexed_db_context_;
+  return url_request_context_.get() == other.url_request_context_.get() &&
+         media_url_request_context_.get() ==
+             other.media_url_request_context_.get() &&
+         appcache_service_.get() == other.appcache_service_.get() &&
+         quota_manager_.get() == other.quota_manager_.get() &&
+         filesystem_context_.get() == other.filesystem_context_.get() &&
+         database_tracker_.get() == other.database_tracker_.get() &&
+         indexed_db_context_.get() == other.indexed_db_context_.get();
 }
 
 WorkerStoragePartition::~WorkerStoragePartition() {
diff --git a/content/common/child_thread.cc b/content/common/child_thread.cc
index 0d6e336..c09931b 100644
--- a/content/common/child_thread.cc
+++ b/content/common/child_thread.cc
@@ -116,9 +116,8 @@ void ChildThread::Init() {
 
   sync_message_filter_ =
       new IPC::SyncMessageFilter(ChildProcess::current()->GetShutDownEvent());
-  thread_safe_sender_ =
-      new ThreadSafeSender(base::MessageLoopProxy::current(),
-                           sync_message_filter_);
+  thread_safe_sender_ = new ThreadSafeSender(base::MessageLoopProxy::current(),
+                                             sync_message_filter_.get());
   histogram_message_filter_ = new ChildHistogramMessageFilter();
   resource_message_filter_ =
       new ChildResourceMessageFilter(resource_dispatcher());
diff --git a/content/common/child_thread.h b/content/common/child_thread.h
index 69a2f1c..4df9203 100644
--- a/content/common/child_thread.h
+++ b/content/common/child_thread.h
@@ -97,14 +97,14 @@ class CONTENT_EXPORT ChildThread : public IPC::Listener, public IPC::Sender {
   // lifetime is less than the main thread. The |filter| returned may only
   // be used on background threads.
   IPC::SyncMessageFilter* sync_message_filter() const {
-    return sync_message_filter_;
+    return sync_message_filter_.get();
   }
 
   // The getter should only be called on the main thread, however the
   // IPC::Sender it returns may be safely called on any thread including
   // the main thread.
   ThreadSafeSender* thread_safe_sender() const {
-    return thread_safe_sender_;
+    return thread_safe_sender_.get();
   }
 
   ChildHistogramMessageFilter* child_histogram_message_filter() const {
diff --git a/content/common/gpu/client/gl_helper_scaling.cc b/content/common/gpu/client/gl_helper_scaling.cc
index 220845e..7de3fc0 100644
--- a/content/common/gpu/client/gl_helper_scaling.cc
+++ b/content/common/gpu/client/gl_helper_scaling.cc
@@ -489,7 +489,7 @@ GLHelperScaling::GetShaderProgram(ShaderType type,
                                   bool swizzle) {
   ShaderProgramKeyType key(type, swizzle);
   scoped_refptr<ShaderProgram>& cache_entry(shader_programs_[key]);
-  if (!cache_entry) {
+  if (!cache_entry.get()) {
     cache_entry = new ShaderProgram(context_, helper_);
     std::basic_string<WebKit::WGC3Dchar> vertex_program;
     std::basic_string<WebKit::WGC3Dchar> fragment_program;
diff --git a/content/common/gpu/client/gpu_channel_host.cc b/content/common/gpu/client/gpu_channel_host.cc
index 41e3580..a8de900 100644
--- a/content/common/gpu/client/gpu_channel_host.cc
+++ b/content/common/gpu/client/gpu_channel_host.cc
@@ -44,10 +44,12 @@ void GpuChannelHost::Connect(
   // Open a channel to the GPU process. We pass NULL as the main listener here
   // since we need to filter everything to route it to the right thread.
   scoped_refptr<base::MessageLoopProxy> io_loop = factory_->GetIOLoopProxy();
-  channel_.reset(new IPC::SyncChannel(
-      channel_handle, IPC::Channel::MODE_CLIENT, NULL,
-      io_loop, true,
-      factory_->GetShutDownEvent()));
+  channel_.reset(new IPC::SyncChannel(channel_handle,
+                                      IPC::Channel::MODE_CLIENT,
+                                      NULL,
+                                      io_loop.get(),
+                                      true,
+                                      factory_->GetShutDownEvent()));
 
   sync_filter_ = new IPC::SyncMessageFilter(
       factory_->GetShutDownEvent());
diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
index 8f003cd..8e426f3 100644
--- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
+++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
@@ -195,7 +195,7 @@ bool WebGraphicsContext3DCommandBufferImpl::Initialize(
     gpu_preference_ = gfx::PreferDiscreteGpu;
 
   host_ = factory_->EstablishGpuChannelSync(cause);
-  if (!host_)
+  if (!host_.get())
     return false;
   DCHECK(host_->state() == GpuChannelHost::kConnected);
 
@@ -276,7 +276,7 @@ bool WebGraphicsContext3DCommandBufferImpl::MaybeInitializeGL(
 bool WebGraphicsContext3DCommandBufferImpl::InitializeCommandBuffer(
     bool onscreen,
     const char* allowed_extensions) {
-  if (!host_)
+  if (!host_.get())
     return false;
   // We need to lock g_all_shared_contexts to ensure that the context we picked
   // for our share group isn't deleted.
@@ -438,7 +438,7 @@ void WebGraphicsContext3DCommandBufferImpl::Destroy() {
   gles2_helper_ = NULL;
 
   if (command_buffer_) {
-    if (host_)
+    if (host_.get())
       host_->DestroyCommandBuffer(command_buffer_);
     else
       delete command_buffer_;
@@ -450,11 +450,11 @@ void WebGraphicsContext3DCommandBufferImpl::Destroy() {
 
 // TODO(apatrick,piman): This should be renamed to something clearer.
 int WebGraphicsContext3DCommandBufferImpl::GetGPUProcessID() {
-  return host_ ? host_->gpu_host_id() : 0;
+  return host_.get() ? host_->gpu_host_id() : 0;
 }
 
 int WebGraphicsContext3DCommandBufferImpl::GetChannelID() {
-  return host_ ? host_->client_id() : 0;
+  return host_.get() ? host_->client_id() : 0;
 }
 
 int WebGraphicsContext3DCommandBufferImpl::GetContextID() {
@@ -1459,7 +1459,7 @@ WGC3Denum WebGraphicsContext3DCommandBufferImpl::getGraphicsResetStatusARB() {
 bool WebGraphicsContext3DCommandBufferImpl::IsCommandBufferContextLost() {
   // If the channel shut down unexpectedly, let that supersede the
   // command buffer's state.
-  if (host_ && host_->state() == GpuChannelHost::kLost)
+  if (host_.get() && host_->state() == GpuChannelHost::kLost)
     return true;
   gpu::CommandBuffer::State state = command_buffer_->GetLastState();
   return state.error == gpu::error::kLostContext;
diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc
index d116d84..47ef904 100644
--- a/content/common/gpu/gpu_channel.cc
+++ b/content/common/gpu/gpu_channel.cc
@@ -126,7 +126,7 @@ class GpuChannelMessageFilter : public IPC::ChannelProxy::MessageFilter {
     // All other messages get processed by the GpuChannel.
     if (!handled) {
       messages_forwarded_to_channel_++;
-      if (preempting_flag_)
+      if (preempting_flag_.get())
         pending_messages_.push(PendingMessage(messages_forwarded_to_channel_));
       UpdatePreemptionState();
     }
@@ -486,7 +486,7 @@ bool GpuChannel::Init(base::MessageLoopProxy* io_message_loop,
       gpu_channel_manager_->sync_point_manager(),
       base::MessageLoopProxy::current());
   io_message_loop_ = io_message_loop;
-  channel_->AddFilter(filter_);
+  channel_->AddFilter(filter_.get());
 
   return true;
 }
@@ -603,11 +603,12 @@ void GpuChannel::StubSchedulingChanged(bool scheduled) {
   bool a_stub_is_descheduled = num_stubs_descheduled_ > 0;
 
   if (a_stub_is_descheduled != a_stub_was_descheduled) {
-    if (preempting_flag_) {
+    if (preempting_flag_.get()) {
       io_message_loop_->PostTask(
           FROM_HERE,
           base::Bind(&GpuChannelMessageFilter::UpdateStubSchedulingState,
-                     filter_, a_stub_is_descheduled));
+                     filter_,
+                     a_stub_is_descheduled));
     }
   }
 }
@@ -637,24 +638,24 @@ void GpuChannel::CreateViewCommandBuffer(
 #endif
 
   *route_id = GenerateRouteID();
-  scoped_ptr<GpuCommandBufferStub> stub(new GpuCommandBufferStub(
-      this,
-      share_group,
-      window,
-      mailbox_manager_,
-      image_manager_,
-      gfx::Size(),
-      disallowed_features_,
-      init_params.allowed_extensions,
-      init_params.attribs,
-      init_params.gpu_preference,
-      use_virtualized_gl_context,
-      *route_id,
-      surface_id,
-      watchdog_,
-      software_,
-      init_params.active_url));
-  if (preempted_flag_)
+  scoped_ptr<GpuCommandBufferStub> stub(
+      new GpuCommandBufferStub(this,
+                               share_group,
+                               window,
+                               mailbox_manager_.get(),
+                               image_manager_.get(),
+                               gfx::Size(),
+                               disallowed_features_,
+                               init_params.allowed_extensions,
+                               init_params.attribs,
+                               init_params.gpu_preference,
+                               use_virtualized_gl_context,
+                               *route_id,
+                               surface_id,
+                               watchdog_,
+                               software_,
+                               init_params.active_url));
+  if (preempted_flag_.get())
     stub->SetPreemptByFlag(preempted_flag_);
   router_.AddRoute(*route_id, stub.get());
   stubs_.AddWithID(stub.release(), *route_id);
@@ -682,7 +683,7 @@ void GpuChannel::CreateImage(
   }
 
   scoped_refptr<gfx::GLImage> image = gfx::GLImage::CreateGLImage(window);
-  if (!image)
+  if (!image.get())
     return;
 
   image_manager_->AddImage(image.get(), image_id);
@@ -721,7 +722,7 @@ void GpuChannel::RemoveRoute(int32 route_id) {
 }
 
 gpu::PreemptionFlag* GpuChannel::GetPreemptionFlag() {
-  if (!preempting_flag_) {
+  if (!preempting_flag_.get()) {
     preempting_flag_ = new gpu::PreemptionFlag;
     io_message_loop_->PostTask(
         FROM_HERE, base::Bind(
@@ -742,7 +743,7 @@ void GpuChannel::SetPreemptByFlag(
 }
 
 GpuChannel::~GpuChannel() {
-  if (preempting_flag_)
+  if (preempting_flag_.get())
     preempting_flag_->Reset();
 }
 
@@ -872,7 +873,7 @@ void GpuChannel::OnCreateOffscreenCommandBuffer(
       watchdog_,
       software_,
       init_params.active_url));
-  if (preempted_flag_)
+  if (preempted_flag_.get())
     stub->SetPreemptByFlag(preempted_flag_);
   router_.AddRoute(*route_id, stub.get());
   stubs_.AddWithID(stub.release(), *route_id);
@@ -941,11 +942,12 @@ void GpuChannel::OnCollectRenderingStatsForSurface(
 
 void GpuChannel::MessageProcessed() {
   messages_processed_++;
-  if (preempting_flag_) {
+  if (preempting_flag_.get()) {
     io_message_loop_->PostTask(
         FROM_HERE,
         base::Bind(&GpuChannelMessageFilter::MessageProcessed,
-                   filter_, messages_processed_));
+                   filter_,
+                   messages_processed_));
   }
 }
 
diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc
index d695ff5..c0747ec 100644
--- a/content/common/gpu/gpu_channel_manager.cc
+++ b/content/common/gpu/gpu_channel_manager.cc
@@ -49,7 +49,7 @@ GpuChannelManager::GpuChannelManager(ChildThread* gpu_child_thread,
 
 GpuChannelManager::~GpuChannelManager() {
   gpu_channels_.clear();
-  if (default_offscreen_surface_) {
+  if (default_offscreen_surface_.get()) {
     default_offscreen_surface_->Destroy();
     default_offscreen_surface_ = NULL;
   }
@@ -90,7 +90,7 @@ GpuChannel* GpuChannelManager::LookupChannel(int32 client_id) {
   if (iter == gpu_channels_.end())
     return NULL;
   else
-    return iter->second;
+    return iter->second.get();
 }
 
 bool GpuChannelManager::OnMessageReceived(const IPC::Message& msg) {
@@ -119,13 +119,13 @@ void GpuChannelManager::OnEstablishChannel(int client_id, bool share_context) {
   gfx::GLShareGroup* share_group = NULL;
   gpu::gles2::MailboxManager* mailbox_manager = NULL;
   if (share_context) {
-    if (!share_group_) {
+    if (!share_group_.get()) {
       share_group_ = new gfx::GLShareGroup;
-      DCHECK(!mailbox_manager_);
+      DCHECK(!mailbox_manager_.get());
       mailbox_manager_ = new gpu::gles2::MailboxManager;
     }
-    share_group = share_group_;
-    mailbox_manager = mailbox_manager_;
+    share_group = share_group_.get();
+    mailbox_manager = mailbox_manager_.get();
   }
 
   scoped_refptr<GpuChannel> channel = new GpuChannel(this,
@@ -134,7 +134,7 @@ void GpuChannelManager::OnEstablishChannel(int client_id, bool share_context) {
                                                      mailbox_manager,
                                                      client_id,
                                                      false);
-  if (channel->Init(io_message_loop_, shutdown_event_)) {
+  if (channel->Init(io_message_loop_.get(), shutdown_event_)) {
     gpu_channels_[client_id] = channel;
     channel_handle.name = channel->GetChannelName();
 
@@ -289,9 +289,9 @@ void GpuChannelManager::OnLoseAllContexts() {
 }
 
 gfx::GLSurface* GpuChannelManager::GetDefaultOffscreenSurface() {
-  if (!default_offscreen_surface_) {
-    default_offscreen_surface_ = gfx::GLSurface::CreateOffscreenGLSurface(
-        false, gfx::Size(1, 1));
+  if (!default_offscreen_surface_.get()) {
+    default_offscreen_surface_ =
+        gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1));
   }
   return default_offscreen_surface_.get();
 }
diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
index 913e9ee..1bbf93b 100644
--- a/content/common/gpu/gpu_channel_manager.h
+++ b/content/common/gpu/gpu_channel_manager.h
@@ -93,7 +93,7 @@ class GpuChannelManager : public IPC::Listener,
 
   GpuChannel* LookupChannel(int32 client_id);
 
-  SyncPointManager* sync_point_manager() { return sync_point_manager_; }
+  SyncPointManager* sync_point_manager() { return sync_point_manager_.get(); }
 
   gfx::GLSurface* GetDefaultOffscreenSurface();
 
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index 582802d..de9caf7 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -370,10 +370,10 @@ void GpuCommandBufferStub::Destroy() {
   // Make sure that context_ is current while we destroy surface_, because
   // surface_ may have GL resources that it needs to destroy, and will need
   // context_ to be current in order to not leak these resources.
-  if (context)
+  if (context.get())
     context->MakeCurrent(surface_.get());
   surface_ = NULL;
-  if (context)
+  if (context.get())
     context->ReleaseCurrent(NULL);
 }
 
@@ -406,7 +406,7 @@ void GpuCommandBufferStub::OnInitialize(
   scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(),
                                          decoder_.get(),
                                          decoder_.get()));
-  if (preemption_flag_)
+  if (preemption_flag_.get())
     scheduler_->SetPreemptByFlag(preemption_flag_);
 
   decoder_->set_engine(scheduler_.get());
@@ -429,7 +429,7 @@ void GpuCommandBufferStub::OnInitialize(
     surface_ = manager->GetDefaultOffscreenSurface();
   }
 
-  if (!surface_) {
+  if (!surface_.get()) {
     DLOG(ERROR) << "Failed to create surface.\n";
     OnInitializeFailed(reply_message);
     return;
@@ -440,19 +440,18 @@ void GpuCommandBufferStub::OnInitialize(
           switches::kEnableVirtualGLContexts) || use_virtualized_gl_context_) &&
       channel_->share_group()) {
     context = channel_->share_group()->GetSharedContext();
-    if (!context) {
+    if (!context.get()) {
       context = gfx::GLContext::CreateGLContext(
           channel_->share_group(),
           channel_->gpu_channel_manager()->GetDefaultOffscreenSurface(),
           gpu_preference_);
-      channel_->share_group()->SetSharedContext(context);
+      channel_->share_group()->SetSharedContext(context.get());
     }
     // This should be a non-virtual GL context.
     DCHECK(context->GetHandle());
-    context = new gpu::GLContextVirtual(channel_->share_group(),
-                                        context,
-                                        decoder_->AsWeakPtr());
-    if (!context->Initialize(surface_, gpu_preference_)) {
+    context = new gpu::GLContextVirtual(
+        channel_->share_group(), context.get(), decoder_->AsWeakPtr());
+    if (!context->Initialize(surface_.get(), gpu_preference_)) {
       // TODO(sievers): The real context created above for the default
       // offscreen surface might not be compatible with this surface.
       // Need to adjust at least GLX to be able to create the initial context
@@ -466,19 +465,17 @@ void GpuCommandBufferStub::OnInitialize(
       LOG(INFO) << "Created virtual GL context.";
     }
   }
-  if (!context) {
+  if (!context.get()) {
     context = gfx::GLContext::CreateGLContext(
-        channel_->share_group(),
-        surface_.get(),
-        gpu_preference_);
+        channel_->share_group(), surface_.get(), gpu_preference_);
   }
-  if (!context) {
+  if (!context.get()) {
     DLOG(ERROR) << "Failed to create context.\n";
     OnInitializeFailed(reply_message);
     return;
   }
 
-  if (!context->MakeCurrent(surface_)) {
+  if (!context->MakeCurrent(surface_.get())) {
     LOG(ERROR) << "Failed to make context current.";
     OnInitializeFailed(reply_message);
     return;
@@ -761,7 +758,7 @@ void GpuCommandBufferStub::OnSetSurfaceVisible(bool visible) {
 
 void GpuCommandBufferStub::OnDiscardBackbuffer() {
   TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnDiscardBackbuffer");
-  if (!surface_)
+  if (!surface_.get())
     return;
   if (surface_->DeferDraws()) {
     DCHECK(!IsScheduled());
@@ -774,7 +771,7 @@ void GpuCommandBufferStub::OnDiscardBackbuffer() {
 
 void GpuCommandBufferStub::OnEnsureBackbuffer() {
   TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnEnsureBackbuffer");
-  if (!surface_)
+  if (!surface_.get())
     return;
   if (surface_->DeferDraws()) {
     DCHECK(!IsScheduled());
@@ -897,7 +894,7 @@ bool GpuCommandBufferStub::GetTotalGpuMemory(uint64* bytes) {
 }
 
 gfx::Size GpuCommandBufferStub::GetSurfaceSize() const {
-  if (!surface_)
+  if (!surface_.get())
     return gfx::Size();
   return surface_->GetSize();
 }
@@ -920,7 +917,7 @@ void GpuCommandBufferStub::SetMemoryAllocation(
           last_memory_allocation_.browser_allocation)) {
     // This can be called outside of OnMessageReceived, so the context needs
     // to be made current before calling methods on the surface.
-    if (surface_ && MakeCurrent())
+    if (surface_.get() && MakeCurrent())
       surface_->SetFrontbufferAllocation(
           allocation.browser_allocation.suggest_have_frontbuffer);
   }
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
index a7ed075..f874f46 100644
--- a/content/common/gpu/gpu_command_buffer_stub.h
+++ b/content/common/gpu/gpu_command_buffer_stub.h
@@ -124,7 +124,7 @@ class GpuCommandBufferStub
 
   void SendCachedShader(const std::string& key, const std::string& shader);
 
-  gfx::GLSurface* surface() const { return surface_; }
+  gfx::GLSurface* surface() const { return surface_.get(); }
 
   void AddDestructionObserver(DestructionObserver* observer);
   void RemoveDestructionObserver(DestructionObserver* observer);
diff --git a/content/common/gpu/gpu_memory_manager_unittest.cc b/content/common/gpu/gpu_memory_manager_unittest.cc
index d877ef6..743ce21 100644
--- a/content/common/gpu/gpu_memory_manager_unittest.cc
+++ b/content/common/gpu/gpu_memory_manager_unittest.cc
@@ -88,7 +88,7 @@ class FakeClient : public GpuMemoryManagerClient {
     if (!share_group_) {
       memory_tracker_ = new FakeMemoryTracker();
       tracking_group_.reset(
-          memmgr_->CreateTrackingGroup(0, memory_tracker_));
+          memmgr_->CreateTrackingGroup(0, memory_tracker_.get()));
     }
     client_state_.reset(memmgr_->CreateClientState(this, false, true));
   }
@@ -104,9 +104,9 @@ class FakeClient : public GpuMemoryManagerClient {
       , tracking_group_(NULL) {
     memory_tracker_ = new FakeMemoryTracker();
     tracking_group_.reset(
-        memmgr_->CreateTrackingGroup(0, memory_tracker_));
-    client_state_.reset(memmgr_->CreateClientState(
-        this, surface_id != 0, visible));
+        memmgr_->CreateTrackingGroup(0, memory_tracker_.get()));
+    client_state_.reset(
+        memmgr_->CreateClientState(this, surface_id != 0, visible));
   }
 
   virtual ~FakeClient() {
diff --git a/content/common/gpu/image_transport_surface.cc b/content/common/gpu/image_transport_surface.cc
index a2789af..bb1e39b 100644
--- a/content/common/gpu/image_transport_surface.cc
+++ b/content/common/gpu/image_transport_surface.cc
@@ -34,7 +34,7 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface(
   else
     surface = CreateNativeSurface(manager, stub, handle);
 
-  if (!surface || !surface->Initialize())
+  if (!surface.get() || !surface->Initialize())
     return NULL;
   return surface;
 }
diff --git a/content/common/gpu/image_transport_surface_linux.cc b/content/common/gpu/image_transport_surface_linux.cc
index f8f95db..c6e5930 100644
--- a/content/common/gpu/image_transport_surface_linux.cc
+++ b/content/common/gpu/image_transport_surface_linux.cc
@@ -16,7 +16,7 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(
          handle.transport_type == gfx::NATIVE_TRANSPORT);
   scoped_refptr<gfx::GLSurface> surface =
       gfx::GLSurface::CreateViewGLSurface(false, handle.handle);
-  if (!surface)
+  if (!surface.get())
     return surface;
   return scoped_refptr<gfx::GLSurface>(new PassThroughImageTransportSurface(
       manager, stub, surface.get(), handle.is_transport()));
diff --git a/content/common/gpu/texture_image_transport_surface.cc b/content/common/gpu/texture_image_transport_surface.cc
index f3d69c0..5092984 100644
--- a/content/common/gpu/texture_image_transport_surface.cc
+++ b/content/common/gpu/texture_image_transport_surface.cc
@@ -57,7 +57,7 @@ bool TextureImageTransportSurface::Initialize() {
 
   GpuChannelManager* manager = helper_->manager();
   surface_ = manager->GetDefaultOffscreenSurface();
-  if (!surface_)
+  if (!surface_.get())
     return false;
 
   if (!helper_->Initialize())
@@ -74,7 +74,7 @@ bool TextureImageTransportSurface::Initialize() {
 }
 
 void TextureImageTransportSurface::Destroy() {
-  if (surface_)
+  if (surface_.get())
     surface_ = NULL;
 
   helper_->Destroy();
@@ -117,7 +117,7 @@ bool TextureImageTransportSurface::SetBackbufferAllocation(bool allocation) {
   backbuffer_suggested_allocation_ = allocation;
 
   if (backbuffer_suggested_allocation_) {
-    DCHECK(!backbuffer_);
+    DCHECK(!backbuffer_.get());
     CreateBackTexture();
   } else {
     ReleaseBackTexture();
@@ -194,7 +194,7 @@ bool TextureImageTransportSurface::SwapBuffers() {
   if (!frontbuffer_suggested_allocation_)
     return true;
 
-  if (!backbuffer_) {
+  if (!backbuffer_.get()) {
     LOG(ERROR) << "Swap without valid backing.";
     return true;
   }
@@ -230,7 +230,7 @@ bool TextureImageTransportSurface::PostSubBuffer(
   if (new_damage_rect.IsEmpty())
     return true;
 
-  if (!backbuffer_) {
+  if (!backbuffer_.get()) {
     LOG(ERROR) << "Swap without valid backing.";
     return true;
   }
@@ -297,7 +297,7 @@ void TextureImageTransportSurface::BufferPresentedImpl(
   // We should not have allowed the backbuffer to be discarded while the ack
   // was pending.
   DCHECK(backbuffer_suggested_allocation_);
-  DCHECK(backbuffer_);
+  DCHECK(backbuffer_.get());
 
   bool swap = true;
   if (!mailbox_name.empty()) {
@@ -319,9 +319,9 @@ void TextureImageTransportSurface::BufferPresentedImpl(
   // finished with its context when it inserts the sync point that
   // triggers this callback.
   if (helper_->MakeCurrent()) {
-    if (frontbuffer_ && !frontbuffer_suggested_allocation_)
+    if (frontbuffer_.get() && !frontbuffer_suggested_allocation_)
       ReleaseFrontTexture();
-    if (!backbuffer_ || backbuffer_size() != current_size_)
+    if (!backbuffer_.get() || backbuffer_size() != current_size_)
       CreateBackTexture();
     else
       AttachBackTextureToFBO();
@@ -363,7 +363,7 @@ void TextureImageTransportSurface::CreateBackTexture() {
   // in the mailbox, so we shouldn't be reallocating it now.
   DCHECK(!is_swap_buffers_pending_);
 
-  if (backbuffer_ && backbuffer_size() == current_size_)
+  if (backbuffer_.get() && backbuffer_size() == current_size_)
     return;
 
   VLOG(1) << "Allocating new backbuffer texture";
@@ -372,25 +372,21 @@ void TextureImageTransportSurface::CreateBackTexture() {
   // size, after we allocated it as 1x1. So here we simply delete
   // the previous texture on resize, to insure we don't 'run out of
   // memory'.
-  if (backbuffer_ &&
-      helper_->stub()
-             ->decoder()
-             ->GetContextGroup()
-             ->feature_info()
-             ->workarounds()
-             .delete_instead_of_resize_fbo) {
+  if (backbuffer_.get() &&
+      helper_->stub()->decoder()->GetContextGroup()->feature_info()
+          ->workarounds().delete_instead_of_resize_fbo) {
     ReleaseBackTexture();
   }
   GLES2Decoder* decoder = helper_->stub()->decoder();
   TextureManager* texture_manager =
       decoder->GetContextGroup()->texture_manager();
-  if (!backbuffer_) {
+  if (!backbuffer_.get()) {
     mailbox_manager_->GenerateMailboxName(&back_mailbox_name_);
     GLuint service_id;
     glGenTextures(1, &service_id);
     backbuffer_ = TextureRef::Create(texture_manager, 0, service_id);
-    texture_manager->SetTarget(backbuffer_, GL_TEXTURE_2D);
-    Texture* texture = texture_manager->Produce(backbuffer_);
+    texture_manager->SetTarget(backbuffer_.get(), GL_TEXTURE_2D);
+    Texture* texture = texture_manager->Produce(backbuffer_.get());
     bool success = mailbox_manager_->ProduceTexture(
         GL_TEXTURE_2D, back_mailbox_name_, texture);
     DCHECK(success);
@@ -403,27 +399,38 @@ void TextureImageTransportSurface::CreateBackTexture() {
         current_size_.width(), current_size_.height(), 0,
         GL_RGBA, GL_UNSIGNED_BYTE, NULL);
     gpu::gles2::ErrorState* error_state = decoder->GetErrorState();
-    texture_manager->SetParameter("Backbuffer", error_state, backbuffer_,
-                                  GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    texture_manager->SetParameter("Backbuffer", error_state, backbuffer_,
-                                  GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    texture_manager->SetParameter("Backbuffer", error_state, backbuffer_,
-                                  GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    texture_manager->SetParameter("Backbuffer", error_state, backbuffer_,
-                                  GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    texture_manager->SetLevelInfo(
-        backbuffer_,
-        GL_TEXTURE_2D,
-        0,
-        GL_RGBA,
-        current_size_.width(),
-        current_size_.height(),
-        1,
-        0,
-        GL_RGBA,
-        GL_UNSIGNED_BYTE,
-        true);
-    DCHECK(texture_manager->CanRender(backbuffer_));
+    texture_manager->SetParameter("Backbuffer",
+                                  error_state,
+                                  backbuffer_.get(),
+                                  GL_TEXTURE_MIN_FILTER,
+                                  GL_LINEAR);
+    texture_manager->SetParameter("Backbuffer",
+                                  error_state,
+                                  backbuffer_.get(),
+                                  GL_TEXTURE_MAG_FILTER,
+                                  GL_LINEAR);
+    texture_manager->SetParameter("Backbuffer",
+                                  error_state,
+                                  backbuffer_.get(),
+                                  GL_TEXTURE_WRAP_S,
+                                  GL_CLAMP_TO_EDGE);
+    texture_manager->SetParameter("Backbuffer",
+                                  error_state,
+                                  backbuffer_.get(),
+                                  GL_TEXTURE_WRAP_T,
+                                  GL_CLAMP_TO_EDGE);
+    texture_manager->SetLevelInfo(backbuffer_.get(),
+                                  GL_TEXTURE_2D,
+                                  0,
+                                  GL_RGBA,
+                                  current_size_.width(),
+                                  current_size_.height(),
+                                  1,
+                                  0,
+                                  GL_RGBA,
+                                  GL_UNSIGNED_BYTE,
+                                  true);
+    DCHECK(texture_manager->CanRender(backbuffer_.get()));
     CHECK_GL_ERROR();
   }
 
@@ -432,7 +439,7 @@ void TextureImageTransportSurface::CreateBackTexture() {
 
 void TextureImageTransportSurface::AttachBackTextureToFBO() {
   DCHECK(helper_->stub()->decoder()->GetGLContext()->IsCurrent(NULL));
-  DCHECK(backbuffer_);
+  DCHECK(backbuffer_.get());
   gfx::ScopedFrameBufferBinder fbo_binder(fbo_id_);
   glFramebufferTexture2DEXT(GL_FRAMEBUFFER,
       GL_COLOR_ATTACHMENT0,
diff --git a/content/common/gpu/texture_image_transport_surface.h b/content/common/gpu/texture_image_transport_surface.h
index 34918f9..68d81d1 100644
--- a/content/common/gpu/texture_image_transport_surface.h
+++ b/content/common/gpu/texture_image_transport_surface.h
@@ -61,7 +61,7 @@ class TextureImageTransportSurface
  private:
 
   gfx::Size backbuffer_size() const {
-    DCHECK(backbuffer_);
+    DCHECK(backbuffer_.get());
     GLsizei width = 0;
     GLsizei height = 0;
     backbuffer_->texture()->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height);
diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc
index 1c0407d..6279319 100644
--- a/content/common/pepper_plugin_registry.cc
+++ b/content/common/pepper_plugin_registry.cc
@@ -229,7 +229,7 @@ PepperPluginRegistry::PepperPluginRegistry() {
     scoped_refptr<webkit::ppapi::PluginModule> module =
         new webkit::ppapi::PluginModule(current.name, current.path, this,
             ppapi::PpapiPermissions(current.permissions));
-    AddLiveModule(current.path, module);
+    AddLiveModule(current.path, module.get());
     if (current.is_internal) {
       if (!module->InitAsInternalPlugin(current.internal_entry_points)) {
         DLOG(ERROR) << "Failed to load pepper module: " << current.path.value();
diff --git a/content/common/resource_messages.cc b/content/common/resource_messages.cc
index ad4bd7f..49684b6 100644
--- a/content/common/resource_messages.cc
+++ b/content/common/resource_messages.cc
@@ -13,7 +13,7 @@ namespace IPC {
 void ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.get() != NULL);
-  if (p) {
+  if (p.get()) {
     // Do not disclose Set-Cookie headers over IPC.
     p->Persist(m, net::HttpResponseHeaders::PERSIST_SANS_COOKIES);
   }
@@ -138,7 +138,7 @@ void ParamTraits<webkit_base::DataElement>::Log(
 void ParamTraits<scoped_refptr<webkit_glue::ResourceDevToolsInfo> >::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.get() != NULL);
-  if (p) {
+  if (p.get()) {
     WriteParam(m, p->http_status_code);
     WriteParam(m, p->http_status_text);
     WriteParam(m, p->request_headers);
@@ -168,7 +168,7 @@ bool ParamTraits<scoped_refptr<webkit_glue::ResourceDevToolsInfo> >::Read(
 void ParamTraits<scoped_refptr<webkit_glue::ResourceDevToolsInfo> >::Log(
     const param_type& p, std::string* l) {
   l->append("(");
-  if (p) {
+  if (p.get()) {
     LogParam(p->request_headers, l);
     l->append(", ");
     LogParam(p->response_headers, l);
@@ -264,7 +264,7 @@ void ParamTraits<scoped_refptr<webkit_glue::ResourceRequestBody> >::Write(
     Message* m,
     const param_type& p) {
   WriteParam(m, p.get() != NULL);
-  if (p) {
+  if (p.get()) {
     WriteParam(m, *p->elements());
     WriteParam(m, p->identifier());
   }
diff --git a/content/common_child/np_channel_base.cc b/content/common_child/np_channel_base.cc
index 328241c..94fb691 100644
--- a/content/common_child/np_channel_base.cc
+++ b/content/common_child/np_channel_base.cc
@@ -39,7 +39,7 @@ NPChannelBase* NPChannelBase::GetChannel(
     channel = iter->second;
   }
 
-  DCHECK(channel != NULL);
+  DCHECK(channel.get() != NULL);
 
   if (!channel->channel_valid()) {
     channel->channel_handle_ = channel_handle;
@@ -55,7 +55,7 @@ NPChannelBase* NPChannelBase::GetChannel(
     }
   }
 
-  return channel;
+  return channel.get();
 }
 
 void NPChannelBase::Broadcast(IPC::Message* message) {
@@ -81,7 +81,7 @@ NPChannelBase::~NPChannelBase() {
 }
 
 NPChannelBase* NPChannelBase::GetCurrentChannel() {
-  return g_lazy_channel_stack.Pointer()->top();
+  return g_lazy_channel_stack.Pointer()->top().get();
 }
 
 void NPChannelBase::CleanupChannels() {
@@ -237,7 +237,7 @@ void NPChannelBase::RemoveRoute(int route_id) {
 
     for (ChannelMap::iterator iter = g_channels.Get().begin();
          iter != g_channels.Get().end(); ++iter) {
-      if (iter->second == this) {
+      if (iter->second.get() == this) {
         g_channels.Get().erase(iter);
         return;
       }
@@ -262,7 +262,7 @@ void NPChannelBase::OnChannelError() {
   // RemoveRoute() can clean things up correctly.
   for (ChannelMap::iterator iter = g_channels.Get().begin();
        iter != g_channels.Get().end(); ++iter) {
-    if (iter->second == this) {
+    if (iter->second.get() == this) {
       // Insert new element before invalidating |iter|.
       g_channels.Get()[iter->first + "-error"] = iter->second;
       g_channels.Get().erase(iter);
diff --git a/content/common_child/npobject_proxy.cc b/content/common_child/npobject_proxy.cc
index 7065607..13c5648 100644
--- a/content/common_child/npobject_proxy.cc
+++ b/content/common_child/npobject_proxy.cc
@@ -70,7 +70,7 @@ NPObjectProxy::NPObjectProxy(
 }
 
 NPObjectProxy::~NPObjectProxy() {
-  if (channel_) {
+  if (channel_.get()) {
     // This NPObjectProxy instance is now invalid and should not be reused for
     // requests initiated by plugins. We may receive requests for the
     // same NPObject in the context of the outgoing NPObjectMsg_Release call.
@@ -94,7 +94,7 @@ NPObject* NPObjectProxy::Create(NPChannelBase* channel,
 }
 
 bool NPObjectProxy::Send(IPC::Message* msg) {
-  if (channel_)
+  if (channel_.get())
     return channel_->Send(msg);
 
   delete msg;
@@ -193,9 +193,12 @@ bool NPObjectProxy::NPInvokePrivate(NPP npp,
   std::vector<NPVariant_Param> args_param;
   for (unsigned int i = 0; i < arg_count; ++i) {
     NPVariant_Param param;
-    CreateNPVariantParam(
-        args[i], channel_copy, &param, false, render_view_id,
-        proxy->page_url_);
+    CreateNPVariantParam(args[i],
+                         channel_copy.get(),
+                         &param,
+                         false,
+                         render_view_id,
+                         proxy->page_url_);
     args_param.push_back(param);
   }
 
@@ -224,7 +227,7 @@ bool NPObjectProxy::NPInvokePrivate(NPP npp,
     return false;
 
   CreateNPVariant(
-      param_result, channel_copy, np_result, render_view_id, page_url);
+      param_result, channel_copy.get(), np_result, render_view_id, page_url);
   return true;
 }
 
@@ -419,9 +422,12 @@ bool NPObjectProxy::NPNConstruct(NPObject *obj,
   std::vector<NPVariant_Param> args_param;
   for (unsigned int i = 0; i < arg_count; ++i) {
     NPVariant_Param param;
-    CreateNPVariantParam(
-        args[i], channel_copy, &param, false, render_view_id,
-        proxy->page_url_);
+    CreateNPVariantParam(args[i],
+                         channel_copy.get(),
+                         &param,
+                         false,
+                         render_view_id,
+                         proxy->page_url_);
     args_param.push_back(param);
   }
 
@@ -445,7 +451,7 @@ bool NPObjectProxy::NPNConstruct(NPObject *obj,
     return false;
 
   CreateNPVariant(
-      param_result, channel_copy, np_result, render_view_id, page_url);
+      param_result, channel_copy.get(), np_result, render_view_id, page_url);
   return true;
 }
 
diff --git a/content/common_child/npobject_proxy.h b/content/common_child/npobject_proxy.h
index cc98138..c46de99 100644
--- a/content/common_child/npobject_proxy.h
+++ b/content/common_child/npobject_proxy.h
@@ -43,7 +43,7 @@ class NPObjectProxy : public IPC::Listener,
   // IPC::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
   int route_id() { return route_id_; }
-  NPChannelBase* channel() { return channel_; }
+  NPChannelBase* channel() { return channel_.get(); }
 
   // The next 9 functions are called on NPObjects from the plugin and browser.
   static bool NPHasMethod(NPObject *obj,
diff --git a/content/common_child/npobject_stub.cc b/content/common_child/npobject_stub.cc
index d72a546..8fcf535 100644
--- a/content/common_child/npobject_stub.cc
+++ b/content/common_child/npobject_stub.cc
@@ -148,10 +148,13 @@ void NPObjectStub::OnInvoke(bool is_default,
   int arg_count = static_cast<int>(args.size());
   NPVariant* args_var = new NPVariant[arg_count];
   for (int i = 0; i < arg_count; ++i) {
-    if (!CreateNPVariant(
-            args[i], channel_, &(args_var[i]), render_view_id_, page_url_)) {
-      NPObjectMsg_Invoke::WriteReplyParams(reply_msg, result_param,
-                                           return_value);
+    if (!CreateNPVariant(args[i],
+                         channel_.get(),
+                         &(args_var[i]),
+                         render_view_id_,
+                         page_url_)) {
+      NPObjectMsg_Invoke::WriteReplyParams(
+          reply_msg, result_param, return_value);
       channel_->Send(reply_msg);
       delete[] args_var;
       return;
@@ -190,8 +193,12 @@ void NPObjectStub::OnInvoke(bool is_default,
 
   delete[] args_var;
 
-  CreateNPVariantParam(
-      result_var, channel_, &result_param, true, render_view_id_, page_url_);
+  CreateNPVariantParam(result_var,
+                       channel_.get(),
+                       &result_param,
+                       true,
+                       render_view_id_,
+                       page_url_);
   NPObjectMsg_Invoke::WriteReplyParams(reply_msg, result_param, return_value);
   channel_->Send(reply_msg);
 }
@@ -228,7 +235,7 @@ void NPObjectStub::OnGetProperty(const NPIdentifier_Param& name,
   }
 
   CreateNPVariantParam(
-      result_var, channel_, property, true, render_view_id_, page_url_);
+      result_var, channel_.get(), property, true, render_view_id_, page_url_);
 }
 
 void NPObjectStub::OnSetProperty(const NPIdentifier_Param& name,
@@ -237,8 +244,11 @@ void NPObjectStub::OnSetProperty(const NPIdentifier_Param& name,
   bool result = false;
   NPIdentifier id = CreateNPIdentifier(name);
   NPVariant property_var;
-  if (!CreateNPVariant(
-          property, channel_, &property_var, render_view_id_, page_url_)) {
+  if (!CreateNPVariant(property,
+                       channel_.get(),
+                       &property_var,
+                       render_view_id_,
+                       page_url_)) {
     NPObjectMsg_SetProperty::WriteReplyParams(reply_msg, result);
     channel_->Send(reply_msg);
     return;
@@ -343,10 +353,13 @@ void NPObjectStub::OnConstruct(const std::vector<NPVariant_Param>& args,
   int arg_count = static_cast<int>(args.size());
   NPVariant* args_var = new NPVariant[arg_count];
   for (int i = 0; i < arg_count; ++i) {
-    if (!CreateNPVariant(
-           args[i], channel_, &(args_var[i]), render_view_id_, page_url_)) {
-      NPObjectMsg_Invoke::WriteReplyParams(reply_msg, result_param,
-                                           return_value);
+    if (!CreateNPVariant(args[i],
+                         channel_.get(),
+                         &(args_var[i]),
+                         render_view_id_,
+                         page_url_)) {
+      NPObjectMsg_Invoke::WriteReplyParams(
+          reply_msg, result_param, return_value);
       channel_->Send(reply_msg);
       delete[] args_var;
       return;
@@ -371,8 +384,12 @@ void NPObjectStub::OnConstruct(const std::vector<NPVariant_Param>& args,
 
   delete[] args_var;
 
-  CreateNPVariantParam(
-      result_var, channel_, &result_param, true, render_view_id_, page_url_);
+  CreateNPVariantParam(result_var,
+                       channel_.get(),
+                       &result_param,
+                       true,
+                       render_view_id_,
+                       page_url_);
   NPObjectMsg_Invoke::WriteReplyParams(reply_msg, result_param, return_value);
   channel_->Send(reply_msg);
 }
@@ -394,8 +411,12 @@ void NPObjectStub::OnEvaluate(const std::string& script,
                                                   &script_string, &result_var);
 
   NPVariant_Param result_param;
-  CreateNPVariantParam(
-      result_var, channel_, &result_param, true, render_view_id_, page_url_);
+  CreateNPVariantParam(result_var,
+                       channel_.get(),
+                       &result_param,
+                       true,
+                       render_view_id_,
+                       page_url_);
   NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value);
   channel_->Send(reply_msg);
 }
diff --git a/content/common_child/webblobregistry_impl.cc b/content/common_child/webblobregistry_impl.cc
index d711c74..32d754d 100644
--- a/content/common_child/webblobregistry_impl.cc
+++ b/content/common_child/webblobregistry_impl.cc
@@ -58,7 +58,8 @@ void WebBlobRegistryImpl::registerBlobURL(
           size_t shared_memory_size = std::min(
               data_size, kMaxSharedMemoryBytes);
           scoped_ptr<base::SharedMemory> shared_memory(
-              ChildThread::AllocateSharedMemory(shared_memory_size, sender_));
+              ChildThread::AllocateSharedMemory(shared_memory_size,
+                                                sender_.get()));
           CHECK(shared_memory.get());
           while (data_size) {
             size_t chunk_size = std::min(data_size, shared_memory_size);
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index c523550..451e31c 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -144,11 +144,11 @@ void GpuChildThread::OnInitialize() {
   // Defer creation of the render thread. This is to prevent it from handling
   // IPC messages before the sandbox has been enabled and all other necessary
   // initialization has succeeded.
-  gpu_channel_manager_.reset(new GpuChannelManager(
-      this,
-      watchdog_thread_,
-      ChildProcess::current()->io_message_loop_proxy(),
-      ChildProcess::current()->GetShutDownEvent()));
+  gpu_channel_manager_.reset(
+      new GpuChannelManager(this,
+                            watchdog_thread_.get(),
+                            ChildProcess::current()->io_message_loop_proxy(),
+                            ChildProcess::current()->GetShutDownEvent()));
 
   // Ensure the browser process receives the GPU info before a reply to any
   // subsequent IPC it might send.
@@ -157,7 +157,7 @@ void GpuChildThread::OnInitialize() {
 }
 
 void GpuChildThread::StopWatchdog() {
-  if (watchdog_thread_) {
+  if (watchdog_thread_.get()) {
     watchdog_thread_->Stop();
   }
 }
@@ -224,7 +224,7 @@ void GpuChildThread::OnHang() {
 
 void GpuChildThread::OnDisableWatchdog() {
   VLOG(1) << "GPU: Disabling watchdog thread";
-  if (watchdog_thread_) {
+  if (watchdog_thread_.get()) {
     // Disarm the watchdog before shutting down the message loop. This prevents
     // the future posting of tasks to the message loop.
     if (watchdog_thread_->message_loop())
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index d8a713b8..2bfd51f 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -276,24 +276,22 @@ namespace {
 void CreateDummyGlContext() {
   scoped_refptr<gfx::GLSurface> surface(
       gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1)));
-  if (!surface) {
+  if (!surface.get()) {
     VLOG(1) << "gfx::GLSurface::CreateOffscreenGLSurface failed";
     return;
   }
 
   // On Linux, this is needed to make sure /dev/nvidiactl has
   // been opened and its descriptor cached.
-  scoped_refptr<gfx::GLContext> context(
-      gfx::GLContext::CreateGLContext(NULL,
-                                      surface,
-                                      gfx::PreferDiscreteGpu));
-  if (!context) {
+  scoped_refptr<gfx::GLContext> context(gfx::GLContext::CreateGLContext(
+      NULL, surface.get(), gfx::PreferDiscreteGpu));
+  if (!context.get()) {
     VLOG(1) << "gfx::GLContext::CreateGLContext failed";
     return;
   }
 
   // Similarly, this is needed for /dev/nvidia0.
-  if (context->MakeCurrent(surface)) {
+  if (context->MakeCurrent(surface.get())) {
     context->ReleaseCurrent(surface.get());
   } else {
     VLOG(1)  << "gfx::GLContext::MakeCurrent failed";
diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc
index bc13d39..8c0321f 100644
--- a/content/plugin/plugin_channel.cc
+++ b/content/plugin/plugin_channel.cc
@@ -263,7 +263,7 @@ void PluginChannel::OnCreateInstance(const std::string& mime_type,
   *instance_id = GenerateRouteID();
   scoped_refptr<WebPluginDelegateStub> stub(new WebPluginDelegateStub(
       mime_type, *instance_id, this));
-  AddRoute(*instance_id, stub, NULL);
+  AddRoute(*instance_id, stub.get(), NULL);
   plugin_stubs_.push_back(stub);
 }
 
@@ -305,7 +305,7 @@ void PluginChannel::OnClearSiteData(const std::string& site,
   base::FilePath path = command_line->GetSwitchValuePath(switches::kPluginPath);
   scoped_refptr<webkit::npapi::PluginLib> plugin_lib(
       webkit::npapi::PluginLib::CreatePluginLib(path));
-  if (plugin_lib) {
+  if (plugin_lib.get()) {
     NPError err = plugin_lib->NP_Initialize();
     if (err == NPERR_NO_ERROR) {
       const char* site_str = site.empty() ? NULL : site.c_str();
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index 623bd88..0be9a91 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -118,7 +118,7 @@ PluginThread::PluginThread()
 
   scoped_refptr<webkit::npapi::PluginLib> plugin(
       webkit::npapi::PluginLib::CreatePluginLib(plugin_path));
-  if (plugin) {
+  if (plugin.get()) {
     plugin->NP_Initialize();
     // For OOP plugins the plugin dll will be unloaded during process shutdown
     // time.
@@ -174,7 +174,7 @@ void PluginThread::OnCreateChannel(int renderer_id,
   scoped_refptr<PluginChannel> channel(PluginChannel::GetPluginChannel(
       renderer_id, ChildProcess::current()->io_message_loop_proxy()));
   IPC::ChannelHandle channel_handle;
-  if (channel) {
+  if (channel.get()) {
     channel_handle.name = channel->channel_handle().name;
 #if defined(OS_POSIX)
     // On POSIX, pass the renderer-side FD.
diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index 3e472af..2b76d8d 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -165,8 +165,10 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
   base::FilePath path =
       command_line.GetSwitchValuePath(switches::kPluginPath);
 
-  webplugin_ = new WebPluginProxy(
-      channel_, instance_id_, page_url_, params.host_render_view_routing_id);
+  webplugin_ = new WebPluginProxy(channel_.get(),
+                                  instance_id_,
+                                  page_url_,
+                                  params.host_render_view_routing_id);
   delegate_ = webkit::npapi::WebPluginDelegateImpl::Create(path, mime_type_);
   if (delegate_) {
     webplugin_->set_delegate(delegate_);
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index f0834d0..5817060 100644
--- a/content/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.cc
@@ -220,8 +220,10 @@ NPObject* WebPluginProxy::GetWindowScriptNPObject() {
   if (!success)
     return NULL;
 
-  window_npobject_ = NPObjectProxy::Create(
-      channel_, npobject_route_id, host_render_view_routing_id_, page_url_);
+  window_npobject_ = NPObjectProxy::Create(channel_.get(),
+                                           npobject_route_id,
+                                           host_render_view_routing_id_,
+                                           page_url_);
 
   return window_npobject_;
 }
@@ -237,8 +239,10 @@ NPObject* WebPluginProxy::GetPluginElement() {
   if (!success)
     return NULL;
 
-  plugin_element_ = NPObjectProxy::Create(
-      channel_, npobject_route_id, host_render_view_routing_id_, page_url_);
+  plugin_element_ = NPObjectProxy::Create(channel_.get(),
+                                          npobject_route_id,
+                                          host_render_view_routing_id_,
+                                          page_url_);
 
   return plugin_element_;
 }
@@ -278,7 +282,7 @@ WebPluginResourceClient* WebPluginProxy::GetResourceClient(int id) {
 }
 
 int WebPluginProxy::GetRendererId() {
-  if (channel_)
+  if (channel_.get())
     return channel_->renderer_id();
   return -1;
 }
diff --git a/content/public/browser/browser_message_filter.cc b/content/public/browser/browser_message_filter.cc
index 6a602a9..372bf6b 100644
--- a/content/public/browser/browser_message_filter.cc
+++ b/content/public/browser/browser_message_filter.cc
@@ -43,10 +43,12 @@ bool BrowserMessageFilter::OnMessageReceived(const IPC::Message& message) {
   if (thread == BrowserThread::IO) {
     scoped_refptr<base::TaskRunner> runner =
         OverrideTaskRunnerForMessage(message);
-    if (runner) {
-      runner->PostTask(FROM_HERE,
+    if (runner.get()) {
+      runner->PostTask(
+          FROM_HERE,
           base::Bind(base::IgnoreResult(&BrowserMessageFilter::DispatchMessage),
-                     this, message));
+                     this,
+                     message));
       return true;
     }
     return DispatchMessage(message);
diff --git a/content/public/test/test_browser_context.cc b/content/public/test/test_browser_context.cc
index 8477038..0f6304d 100644
--- a/content/public/test/test_browser_context.cc
+++ b/content/public/test/test_browser_context.cc
@@ -70,7 +70,7 @@ DownloadManagerDelegate* TestBrowserContext::GetDownloadManagerDelegate() {
 }
 
 net::URLRequestContextGetter* TestBrowserContext::GetRequestContext() {
-  if (!request_context_) {
+  if (!request_context_.get()) {
     request_context_ = new TestContextURLRequestContextGetter(
         GetResourceContext()->GetRequestContext());
   }
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index ce7f813..1b7a4e5 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -434,7 +434,7 @@ void BrowserPlugin::Attach(int guest_instance_id) {
 }
 
 void BrowserPlugin::DidCommitCompositorFrame() {
-  if (compositing_helper_)
+  if (compositing_helper_.get())
     compositing_helper_->DidCommitCompositorFrame();
 }
 
@@ -1181,12 +1181,12 @@ void BrowserPlugin::EnableCompositing(bool enable) {
     // compositing.
     backing_store_.reset();
     current_damage_buffer_.reset();
-    if (!compositing_helper_) {
-      compositing_helper_ = new BrowserPluginCompositingHelper(
-          container_,
-          browser_plugin_manager(),
-          guest_instance_id_,
-          render_view_routing_id_);
+    if (!compositing_helper_.get()) {
+      compositing_helper_ =
+          new BrowserPluginCompositingHelper(container_,
+                                             browser_plugin_manager(),
+                                             guest_instance_id_,
+                                             render_view_routing_id_);
     }
   } else {
     // We're switching back to the software path. We create a new damage
@@ -1216,7 +1216,7 @@ void BrowserPlugin::destroy() {
   // call returns, so let's not keep a reference to it around.
   g_plugin_container_map.Get().erase(container_);
   container_ = NULL;
-  if (compositing_helper_)
+  if (compositing_helper_.get())
     compositing_helper_->OnContainerDestroy();
   // Will be a no-op if the mouse is not currently locked.
   if (render_view_)
@@ -1485,7 +1485,7 @@ void BrowserPlugin::updateVisibility(bool visible) {
   if (!HasGuestInstanceID())
     return;
 
-  if (compositing_helper_)
+  if (compositing_helper_.get())
     compositing_helper_->UpdateVisibility(visible);
 
   browser_plugin_manager()->Send(new BrowserPluginHostMsg_SetVisibility(
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index 227a401..a4537fc 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -259,7 +259,7 @@ class CONTENT_EXPORT BrowserPlugin :
   // Gets the Min Width value used for auto size.
   int GetAdjustedMinWidth() const;
   BrowserPluginManager* browser_plugin_manager() const {
-    return browser_plugin_manager_;
+    return browser_plugin_manager_.get();
   }
 
   // Virtual to allow for mocking in tests.
diff --git a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
index 92997f3..c95d666 100644
--- a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
+++ b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
@@ -40,7 +40,7 @@ BrowserPluginCompositingHelper::~BrowserPluginCompositingHelper() {
 }
 
 void BrowserPluginCompositingHelper::DidCommitCompositorFrame() {
-  if (!delegated_layer_ || !ack_pending_)
+  if (!delegated_layer_.get() || !ack_pending_)
     return;
 
   cc::CompositorFrameAck ack;
@@ -58,7 +58,7 @@ void BrowserPluginCompositingHelper::DidCommitCompositorFrame() {
 }
 
 void BrowserPluginCompositingHelper::EnableCompositing(bool enable) {
-  if (enable && !background_layer_) {
+  if (enable && !background_layer_.get()) {
     background_layer_ = cc::SolidColorLayer::Create();
     background_layer_->SetMasksToBounds(true);
     background_layer_->SetBackgroundColor(
@@ -99,7 +99,7 @@ void BrowserPluginCompositingHelper::FreeMailboxMemory(
 
   scoped_refptr<cc::ContextProvider> context_provider =
       RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
-  if (!context_provider)
+  if (!context_provider.get())
     return;
 
   WebKit::WebGraphicsContext3D *context = context_provider->Context3d();
@@ -195,7 +195,7 @@ void BrowserPluginCompositingHelper::OnBuffersSwapped(
     int gpu_route_id,
     int gpu_host_id,
     float device_scale_factor) {
-  DCHECK(!delegated_layer_);
+  DCHECK(!delegated_layer_.get());
   // If the guest crashed but the GPU process didn't, we may still have
   // a transport surface waiting on an ACK, which we must send to
   // avoid leaking.
@@ -214,12 +214,12 @@ void BrowserPluginCompositingHelper::OnBuffersSwapped(
 
   ack_pending_ = true;
   // Browser plugin getting destroyed, do a fast ACK.
-  if (!background_layer_) {
+  if (!background_layer_.get()) {
     MailboxReleased(mailbox_name, gpu_route_id, gpu_host_id, 0, false);
     return;
   }
 
-  if (!texture_layer_) {
+  if (!texture_layer_.get()) {
     texture_layer_ = cc::TextureLayer::CreateForMailbox(NULL);
     texture_layer_->SetIsDrawable(true);
     texture_layer_->SetContentsOpaque(true);
@@ -266,8 +266,8 @@ void BrowserPluginCompositingHelper::OnCompositorFrameSwapped(
     scoped_ptr<cc::CompositorFrame> frame,
     int route_id,
     int host_id) {
-  DCHECK(!texture_layer_);
-  if (!delegated_layer_) {
+  DCHECK(!texture_layer_.get());
+  if (!delegated_layer_.get()) {
     delegated_layer_ = cc::DelegatedRendererLayer::Create(NULL);
     delegated_layer_->SetIsDrawable(true);
     delegated_layer_->SetContentsOpaque(true);
@@ -291,9 +291,9 @@ void BrowserPluginCompositingHelper::OnCompositorFrameSwapped(
 }
 
 void BrowserPluginCompositingHelper::UpdateVisibility(bool visible) {
-  if (texture_layer_)
+  if (texture_layer_.get())
     texture_layer_->SetIsDrawable(visible);
-  if (delegated_layer_)
+  if (delegated_layer_.get())
     delegated_layer_->SetIsDrawable(visible);
 }
 
diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.cc b/content/renderer/dom_storage/dom_storage_dispatcher.cc
index e746440..2ad1f67 100644
--- a/content/renderer/dom_storage/dom_storage_dispatcher.cc
+++ b/content/renderer/dom_storage/dom_storage_dispatcher.cc
@@ -175,7 +175,7 @@ class DomStorageDispatcher::ProxyImpl : public DomStorageProxy {
 DomStorageDispatcher::ProxyImpl::ProxyImpl(RenderThreadImpl* sender)
     : sender_(sender),
       throttling_filter_(new MessageThrottlingFilter(sender)) {
-  sender_->AddFilter(throttling_filter_);
+  sender_->AddFilter(throttling_filter_.get());
 }
 
 DomStorageCachedArea* DomStorageDispatcher::ProxyImpl::OpenCachedArea(
@@ -183,11 +183,11 @@ DomStorageCachedArea* DomStorageDispatcher::ProxyImpl::OpenCachedArea(
   std::string key = GetCachedAreaKey(namespace_id, origin);
   if (CachedAreaHolder* holder = GetAreaHolder(key)) {
     ++(holder->open_count_);
-    return holder->area_;
+    return holder->area_.get();
   }
   scoped_refptr<DomStorageCachedArea> area =
       new DomStorageCachedArea(namespace_id, origin, this);
-  cached_areas_[key] = CachedAreaHolder(area, 1);
+  cached_areas_[key] = CachedAreaHolder(area.get(), 1);
   return area.get();
 }
 
@@ -218,7 +218,7 @@ void DomStorageDispatcher::ProxyImpl::CompleteOnePendingCallback(bool success) {
 
 void DomStorageDispatcher::ProxyImpl::Shutdown() {
   throttling_filter_->Shutdown();
-  sender_->RemoveFilter(throttling_filter_);
+  sender_->RemoveFilter(throttling_filter_.get());
   sender_ = NULL;
   cached_areas_.clear();
   pending_callbacks_.clear();
diff --git a/content/renderer/dom_storage/webstoragearea_impl.cc b/content/renderer/dom_storage/webstoragearea_impl.cc
index 543346c..e5ba057 100644
--- a/content/renderer/dom_storage/webstoragearea_impl.cc
+++ b/content/renderer/dom_storage/webstoragearea_impl.cc
@@ -45,7 +45,7 @@ WebStorageAreaImpl::WebStorageAreaImpl(
 WebStorageAreaImpl::~WebStorageAreaImpl() {
   g_all_areas_map.Pointer()->Remove(connection_id_);
   if (dispatcher())
-    dispatcher()->CloseCachedArea(connection_id_, cached_area_);
+    dispatcher()->CloseCachedArea(connection_id_, cached_area_.get());
 }
 
 unsigned WebStorageAreaImpl::length() {
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc
index 16d6ad0..55af865 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -58,13 +58,13 @@ CompositorOutputSurface::CompositorOutputSurface(
       routing_id_(routing_id),
       prefers_smoothness_(false),
       main_thread_handle_(base::PlatformThread::CurrentHandle()) {
-  DCHECK(output_surface_filter_);
+  DCHECK(output_surface_filter_.get());
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   capabilities_.has_parent_compositor = command_line->HasSwitch(
       switches::kEnableDelegatedRenderer);
   DetachFromThread();
   message_sender_ = RenderThreadImpl::current()->sync_message_filter();
-  DCHECK(message_sender_);
+  DCHECK(message_sender_.get());
 }
 
 CompositorOutputSurface::~CompositorOutputSurface() {
@@ -72,7 +72,7 @@ CompositorOutputSurface::~CompositorOutputSurface() {
   if (!client_)
     return;
   UpdateSmoothnessTakesPriority(false);
-  if (output_surface_proxy_)
+  if (output_surface_proxy_.get())
     output_surface_proxy_->ClearOutputSurface();
   output_surface_filter_->RemoveRoute(routing_id_);
 }
diff --git a/content/renderer/gpu/input_event_filter.cc b/content/renderer/gpu/input_event_filter.cc
index 96a7034..9488963 100644
--- a/content/renderer/gpu/input_event_filter.cc
+++ b/content/renderer/gpu/input_event_filter.cc
@@ -22,7 +22,7 @@ InputEventFilter::InputEventFilter(
       sender_(NULL),
       target_loop_(target_loop),
       handler_(handler) {
-  DCHECK(target_loop_);
+  DCHECK(target_loop_.get());
   DCHECK(!handler_.is_null());
 }
 
diff --git a/content/renderer/gpu/input_event_filter_unittest.cc b/content/renderer/gpu/input_event_filter_unittest.cc
index 85da87f..2238493 100644
--- a/content/renderer/gpu/input_event_filter_unittest.cc
+++ b/content/renderer/gpu/input_event_filter_unittest.cc
@@ -136,7 +136,7 @@ class InputEventFilterTest : public testing::Test {
         message_loop_.message_loop_proxy(),
         base::Bind(&InputEventRecorder::HandleInputEvent,
             base::Unretained(&event_recorder_)));
-    event_recorder_.set_filter(filter_);
+    event_recorder_.set_filter(filter_.get());
 
     filter_->OnFilterAdded(&ipc_sink_);
   }
@@ -163,14 +163,14 @@ TEST_F(InputEventFilterTest, Basic) {
   InitMouseEvent(&kEvents[1], WebInputEvent::MouseMove, 20, 20);
   InitMouseEvent(&kEvents[2], WebInputEvent::MouseUp, 30, 30);
 
-  AddEventsToFilter(filter_, kEvents, arraysize(kEvents));
+  AddEventsToFilter(filter_.get(), kEvents, arraysize(kEvents));
   EXPECT_EQ(0U, ipc_sink_.message_count());
   EXPECT_EQ(0U, event_recorder_.record_count());
   EXPECT_EQ(0U, message_recorder_.message_count());
 
   filter_->AddRoute(kTestRoutingID);
 
-  AddEventsToFilter(filter_, kEvents, arraysize(kEvents));
+  AddEventsToFilter(filter_.get(), kEvents, arraysize(kEvents));
   ASSERT_EQ(arraysize(kEvents), ipc_sink_.message_count());
   ASSERT_EQ(arraysize(kEvents), event_recorder_.record_count());
   EXPECT_EQ(0U, message_recorder_.message_count());
@@ -197,7 +197,7 @@ TEST_F(InputEventFilterTest, Basic) {
 
   event_recorder_.set_send_to_widget(true);
 
-  AddEventsToFilter(filter_, kEvents, arraysize(kEvents));
+  AddEventsToFilter(filter_.get(), kEvents, arraysize(kEvents));
   EXPECT_EQ(arraysize(kEvents), ipc_sink_.message_count());
   EXPECT_EQ(2 * arraysize(kEvents), event_recorder_.record_count());
   EXPECT_EQ(arraysize(kEvents), message_recorder_.message_count());
@@ -220,7 +220,7 @@ TEST_F(InputEventFilterTest, Basic) {
 
   event_recorder_.set_handle_events(true);
 
-  AddEventsToFilter(filter_, kEvents, arraysize(kEvents));
+  AddEventsToFilter(filter_.get(), kEvents, arraysize(kEvents));
   EXPECT_EQ(arraysize(kEvents), ipc_sink_.message_count());
   EXPECT_EQ(arraysize(kEvents), event_recorder_.record_count());
   EXPECT_EQ(0U, message_recorder_.message_count());
@@ -286,7 +286,7 @@ TEST_F(InputEventFilterTest, PreserveRelativeOrder) {
                                               &mouse_up,
                                               ui::LatencyInfo(),
                                               false));
-  AddMessagesToFilter(filter_, messages);
+  AddMessagesToFilter(filter_.get(), messages);
 
   // We should have sent all messages back to the main thread and preserved
   // their relative order.
diff --git a/content/renderer/gpu/input_handler_manager.cc b/content/renderer/gpu/input_handler_manager.cc
index aeff90e..84d2336 100644
--- a/content/renderer/gpu/input_handler_manager.cc
+++ b/content/renderer/gpu/input_handler_manager.cc
@@ -31,7 +31,7 @@ InputHandlerManager::~InputHandlerManager() {
 
 IPC::ChannelProxy::MessageFilter*
 InputHandlerManager::GetMessageFilter() const {
-  return filter_;
+  return filter_.get();
 }
 
 void InputHandlerManager::AddInputHandler(
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 8fd3365..b9fb860 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -365,7 +365,7 @@ bool RenderWidgetCompositor::initialize(cc::LayerTreeSettings settings) {
   scoped_ptr<cc::Thread> impl_thread;
   scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy =
       RenderThreadImpl::current()->compositor_message_loop_proxy();
-  threaded_ = !!compositor_message_loop_proxy;
+  threaded_ = !!compositor_message_loop_proxy.get();
   if (threaded_) {
     impl_thread = cc::ThreadImpl::CreateForDifferentThread(
         compositor_message_loop_proxy);
diff --git a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
index 900162f..40b0c8c 100644
--- a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
+++ b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
@@ -44,7 +44,7 @@ class AudioRendererMixerManagerTest : public testing::Test {
     // We don't want to deal with instantiating a real AudioOutputDevice since
     // it's not important to our testing, so we inject a mock.
     mock_sink_ = new media::MockAudioRendererSink();
-    manager_->SetAudioRendererSinkForTesting(mock_sink_);
+    manager_->SetAudioRendererSinkForTesting(mock_sink_.get());
   }
 
   media::AudioRendererMixer* GetMixer(int source_render_view_id,
@@ -75,8 +75,8 @@ class AudioRendererMixerManagerTest : public testing::Test {
 TEST_F(AudioRendererMixerManagerTest, GetRemoveMixer) {
   // Since we're testing two different sets of parameters, we expect
   // AudioRendererMixerManager to call Start and Stop on our mock twice.
-  EXPECT_CALL(*mock_sink_, Start()).Times(2);
-  EXPECT_CALL(*mock_sink_, Stop()).Times(2);
+  EXPECT_CALL(*mock_sink_.get(), Start()).Times(2);
+  EXPECT_CALL(*mock_sink_.get(), Stop()).Times(2);
 
   // There should be no mixers outstanding to start with.
   EXPECT_EQ(mixer_count(), 0);
@@ -121,8 +121,8 @@ TEST_F(AudioRendererMixerManagerTest, GetRemoveMixer) {
 TEST_F(AudioRendererMixerManagerTest, CreateInput) {
   // Expect AudioRendererMixerManager to call Start and Stop on our mock twice
   // each.  Note: Under normal conditions, each mixer would get its own sink!
-  EXPECT_CALL(*mock_sink_, Start()).Times(2);
-  EXPECT_CALL(*mock_sink_, Stop()).Times(2);
+  EXPECT_CALL(*mock_sink_.get(), Start()).Times(2);
+  EXPECT_CALL(*mock_sink_.get(), Stop()).Times(2);
 
   media::AudioParameters params(
       media::AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout, kSampleRate,
diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc
index ef762ef..62dd21c 100644
--- a/content/renderer/media/media_stream_center.cc
+++ b/content/renderer/media/media_stream_center.cc
@@ -29,7 +29,7 @@ static webrtc::MediaStreamInterface* GetNativeMediaStream(
     const WebKit::WebMediaStream& stream) {
   MediaStreamExtraData* extra_data =
       static_cast<MediaStreamExtraData*>(stream.extraData());
-  return extra_data->stream();
+  return extra_data->stream().get();
 }
 
 static webrtc::MediaStreamTrackInterface* GetNativeMediaStreamTrack(
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc
index 32f4d01..5dd84bf 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -113,7 +113,7 @@ class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface {
     }
 
     return new P2PPortAllocator(web_frame_,
-                                socket_dispatcher_,
+                                socket_dispatcher_.get(),
                                 network_manager_,
                                 socket_factory_,
                                 config);
@@ -331,8 +331,8 @@ void MediaStreamDependencyFactory::CreateNativeLocalMediaStream(
   std::string label = UTF16ToUTF8(description->label());
   scoped_refptr<webrtc::MediaStreamInterface> native_stream =
       CreateLocalMediaStream(label);
-  MediaStreamExtraData* extra_data = new MediaStreamExtraData(native_stream,
-                                                              true);
+  MediaStreamExtraData* extra_data =
+      new MediaStreamExtraData(native_stream.get(), true);
   description->setExtraData(extra_data);
 
   // Add audio tracks.
@@ -365,7 +365,7 @@ bool MediaStreamDependencyFactory::AddNativeMediaStreamTrack(
       const WebKit::WebMediaStreamTrack& track) {
   MediaStreamExtraData* extra_data =
      static_cast<MediaStreamExtraData*>(stream.extraData());
-  webrtc::MediaStreamInterface* native_stream = extra_data->stream();
+  webrtc::MediaStreamInterface* native_stream = extra_data->stream().get();
   DCHECK(native_stream);
 
   WebKit::WebMediaStreamSource source = track.source();
@@ -407,16 +407,16 @@ bool MediaStreamDependencyFactory::AddNativeMediaStreamTrack(
         CreateLocalAudioTrack(track_id, source_data->local_audio_source()));
     audio_track->set_enabled(track.isEnabled());
     if (GetWebRtcAudioDevice()) {
-      WebRtcAudioCapturer* capturer = GetWebRtcAudioDevice()->capturer();
+      WebRtcAudioCapturer* capturer = GetWebRtcAudioDevice()->capturer().get();
       if (!capturer->is_recording())
         capturer->Start();
     }
-    return native_stream->AddTrack(audio_track);
+    return native_stream->AddTrack(audio_track.get());
   } else {
     scoped_refptr<webrtc::VideoTrackInterface> video_track(
         CreateLocalVideoTrack(track_id, source_data->video_source()));
     video_track->set_enabled(track.isEnabled());
-    return native_stream->AddTrack(video_track);
+    return native_stream->AddTrack(video_track.get());
   }
 }
 
@@ -437,8 +437,8 @@ bool MediaStreamDependencyFactory::AddNativeVideoMediaTrack(
   MediaStreamExtraData* extra_data =
       static_cast<MediaStreamExtraData*>(stream->extraData());
   DCHECK(extra_data);
-  webrtc::MediaStreamInterface* native_stream = extra_data->stream();
-  native_stream->AddTrack(native_track);
+  webrtc::MediaStreamInterface* native_stream = extra_data->stream().get();
+  native_stream->AddTrack(native_track.get());
 
   // Create a new webkit video track.
   WebKit::WebMediaStreamTrack webkit_track;
@@ -459,7 +459,7 @@ bool MediaStreamDependencyFactory::RemoveNativeMediaStreamTrack(
     const WebKit::WebMediaStreamTrack& track) {
   MediaStreamExtraData* extra_data =
       static_cast<MediaStreamExtraData*>(stream.extraData());
-  webrtc::MediaStreamInterface* native_stream = extra_data->stream();
+  webrtc::MediaStreamInterface* native_stream = extra_data->stream().get();
   DCHECK(native_stream);
 
   WebKit::WebMediaStreamSource::Type type = track.source().type();
@@ -474,13 +474,16 @@ bool MediaStreamDependencyFactory::RemoveNativeMediaStreamTrack(
 
 bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() {
   DVLOG(1) << "MediaStreamDependencyFactory::CreatePeerConnectionFactory()";
-  if (!pc_factory_) {
-    DCHECK(!audio_device_);
+  if (!pc_factory_.get()) {
+    DCHECK(!audio_device_.get());
     audio_device_ = new WebRtcAudioDeviceImpl();
     scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory(
-        webrtc::CreatePeerConnectionFactory(
-            worker_thread_, signaling_thread_, audio_device_, NULL, NULL));
-    if (factory)
+        webrtc::CreatePeerConnectionFactory(worker_thread_,
+                                            signaling_thread_,
+                                            audio_device_.get(),
+                                            NULL,
+                                            NULL));
+    if (factory.get())
       pc_factory_ = factory;
     else
       audio_device_ = NULL;
@@ -521,7 +524,8 @@ MediaStreamDependencyFactory::CreatePeerConnection(
             socket_factory_.get(),
             web_frame);
   return pc_factory_->CreatePeerConnection(
-      ice_servers, constraints, pa_factory, observer).get();
+                          ice_servers, constraints, pa_factory.get(), observer)
+      .get();
 }
 
 scoped_refptr<webrtc::MediaStreamInterface>
@@ -564,7 +568,7 @@ bool MediaStreamDependencyFactory::InitializeAudioSource(
 
   // Initialize the source using audio parameters for the selected
   // capture device.
-  WebRtcAudioCapturer* capturer = GetWebRtcAudioDevice()->capturer();
+  WebRtcAudioCapturer* capturer = GetWebRtcAudioDevice()->capturer().get();
   // TODO(henrika): refactor \content\public\common\media_stream_request.h
   // to allow dependency of media::ChannelLayout and avoid static_cast.
   if (!capturer->Initialize(
@@ -584,7 +588,7 @@ bool MediaStreamDependencyFactory::CreateWebAudioSource(
   // WebAudio needs the WebRtcAudioCapturer to be able to send its data
   // over a PeerConnection. The microphone source is not utilized in this
   // case; instead the WebRtcAudioCapturer is driving.
-  WebRtcAudioCapturer* capturer = GetWebRtcAudioDevice()->capturer();
+  WebRtcAudioCapturer* capturer = GetWebRtcAudioDevice()->capturer().get();
   if (!capturer)
     return false;
 
@@ -594,7 +598,7 @@ bool MediaStreamDependencyFactory::CreateWebAudioSource(
   scoped_refptr<WebAudioCapturerSource>
       webaudio_capturer_source(new WebAudioCapturerSource(capturer));
   MediaStreamSourceExtraData* source_data =
-      new content::MediaStreamSourceExtraData(webaudio_capturer_source);
+      new content::MediaStreamSourceExtraData(webaudio_capturer_source.get());
 
   // Create a LocalAudioSource object which holds audio options.
   // Use audio constraints where all values are false, i.e., disable
@@ -607,7 +611,7 @@ bool MediaStreamDependencyFactory::CreateWebAudioSource(
   source->setExtraData(source_data);
 
   // Replace the default source with WebAudio as source instead.
-  source->addAudioConsumer(webaudio_capturer_source);
+  source->addAudioConsumer(webaudio_capturer_source.get());
 
   return true;
 }
@@ -632,7 +636,7 @@ MediaStreamDependencyFactory::CreateLocalVideoTrack(
       pc_factory_->CreateVideoSource(capturer, NULL).get();
 
   // Create native track from the source.
-  return pc_factory_->CreateVideoTrack(id, source).get();
+  return pc_factory_->CreateVideoTrack(id, source.get()).get();
 }
 
 scoped_refptr<webrtc::AudioTrackInterface>
@@ -663,19 +667,19 @@ webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate(
 
 WebRtcAudioDeviceImpl*
 MediaStreamDependencyFactory::GetWebRtcAudioDevice() {
-  return audio_device_;
+  return audio_device_.get();
 }
 
 void MediaStreamDependencyFactory::StopLocalAudioSource(
     const WebKit::WebMediaStream& description) {
   MediaStreamExtraData* extra_data = static_cast<MediaStreamExtraData*>(
       description.extraData());
-  if (extra_data && extra_data->is_local() && extra_data->stream() &&
+  if (extra_data && extra_data->is_local() && extra_data->stream().get() &&
       !extra_data->stream()->GetAudioTracks().empty()) {
     if (GetWebRtcAudioDevice()) {
       scoped_refptr<WebRtcAudioCapturer> capturer =
           GetWebRtcAudioDevice()->capturer();
-      if (capturer)
+      if (capturer.get())
         capturer->Stop();
     }
   }
@@ -693,7 +697,7 @@ void MediaStreamDependencyFactory::InitializeWorkerThread(
 void MediaStreamDependencyFactory::CreateIpcNetworkManagerOnWorkerThread(
     base::WaitableEvent* event) {
   DCHECK_EQ(base::MessageLoop::current(), chrome_worker_thread_.message_loop());
-  network_manager_ = new IpcNetworkManager(p2p_socket_dispatcher_);
+  network_manager_ = new IpcNetworkManager(p2p_socket_dispatcher_.get());
   event->Signal();
 }
 
@@ -744,7 +748,7 @@ bool MediaStreamDependencyFactory::EnsurePeerConnectionFactory() {
 
   if (!socket_factory_) {
     socket_factory_.reset(
-        new IpcPacketSocketFactory(p2p_socket_dispatcher_));
+        new IpcPacketSocketFactory(p2p_socket_dispatcher_.get()));
   }
 
   // Init SSL, which will be needed by PeerConnection.
diff --git a/content/renderer/media/media_stream_dependency_factory_unittest.cc b/content/renderer/media/media_stream_dependency_factory_unittest.cc
index 9c58c65..7f3123e 100644
--- a/content/renderer/media/media_stream_dependency_factory_unittest.cc
+++ b/content/renderer/media/media_stream_dependency_factory_unittest.cc
@@ -127,7 +127,7 @@ class MediaStreamDependencyFactoryTest : public ::testing::Test {
                          size_t num_video_tracks) {
     content::MediaStreamExtraData* extra_data =
         static_cast<content::MediaStreamExtraData*>(stream_desc.extraData());
-    ASSERT_TRUE(extra_data && extra_data->stream());
+    ASSERT_TRUE(extra_data && extra_data->stream().get());
     EXPECT_TRUE(extra_data->is_local());
     EXPECT_EQ(num_audio_tracks, extra_data->stream()->GetAudioTracks().size());
     EXPECT_EQ(num_video_tracks, extra_data->stream()->GetVideoTracks().size());
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index 7f2de52..20277b8 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -101,7 +101,7 @@ webrtc::MediaStreamInterface* GetNativeMediaStream(
       static_cast<content::MediaStreamExtraData*>(descriptor.extraData());
   if (!extra_data)
     return NULL;
-  return extra_data->stream();
+  return extra_data->stream().get();
 }
 
 }  // namespace
@@ -258,10 +258,10 @@ MediaStreamImpl::GetAudioRenderer(const GURL& url) {
 
   if (extra_data->is_local()) {
     // Create the local audio renderer if the stream contains audio tracks.
-    return CreateLocalAudioRenderer(extra_data->stream());
+    return CreateLocalAudioRenderer(extra_data->stream().get());
   }
 
-  webrtc::MediaStreamInterface* stream = extra_data->stream();
+  webrtc::MediaStreamInterface* stream = extra_data->stream().get();
   if (!stream || stream->GetAudioTracks().empty())
     return NULL;
 
@@ -271,10 +271,10 @@ MediaStreamImpl::GetAudioRenderer(const GURL& url) {
 
   // Share the existing renderer if any, otherwise create a new one.
   scoped_refptr<WebRtcAudioRenderer> renderer(audio_device->renderer());
-  if (!renderer) {
-    renderer = CreateRemoteAudioRenderer(extra_data->stream());
+  if (!renderer.get()) {
+    renderer = CreateRemoteAudioRenderer(extra_data->stream().get());
 
-    if (renderer && !audio_device->SetAudioRenderer(renderer))
+    if (renderer.get() && !audio_device->SetAudioRenderer(renderer.get()))
       renderer = NULL;
   }
   return renderer;
@@ -549,7 +549,7 @@ MediaStreamImpl::CreateLocalAudioRenderer(
 
   scoped_refptr<WebRtcAudioCapturer> source =
       dependency_factory_->GetWebRtcAudioDevice()->capturer();
-  if (!source) {
+  if (!source.get()) {
     return NULL;
   }
 
diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc
index 628edb4..513a611 100644
--- a/content/renderer/media/media_stream_impl_unittest.cc
+++ b/content/renderer/media/media_stream_impl_unittest.cc
@@ -95,7 +95,7 @@ class MediaStreamImplTest : public ::testing::Test {
     WebKit::WebMediaStream desc = ms_impl_->last_generated_stream();
     content::MediaStreamExtraData* extra_data =
         static_cast<content::MediaStreamExtraData*>(desc.extraData());
-    if (!extra_data || !extra_data->stream()) {
+    if (!extra_data || !extra_data->stream().get()) {
       ADD_FAILURE();
       return desc;
     }
diff --git a/content/renderer/media/media_stream_source_extra_data.h b/content/renderer/media/media_stream_source_extra_data.h
index 0294b91..c997832 100644
--- a/content/renderer/media/media_stream_source_extra_data.h
+++ b/content/renderer/media/media_stream_source_extra_data.h
@@ -46,10 +46,10 @@ class CONTENT_EXPORT MediaStreamSourceExtraData
     // See |source_observer_|.
   }
 
-  webrtc::VideoSourceInterface* video_source() { return video_source_; }
-  media::AudioCapturerSource* audio_source() { return audio_source_; }
+  webrtc::VideoSourceInterface* video_source() { return video_source_.get(); }
+  media::AudioCapturerSource* audio_source() { return audio_source_.get(); }
   webrtc::AudioSourceInterface* local_audio_source() {
-    return local_audio_source_;
+    return local_audio_source_.get();
   }
 
  private:
diff --git a/content/renderer/media/media_stream_source_observer.cc b/content/renderer/media/media_stream_source_observer.cc
index a62c997..1f165bb 100644
--- a/content/renderer/media/media_stream_source_observer.cc
+++ b/content/renderer/media/media_stream_source_observer.cc
@@ -20,14 +20,14 @@ MediaStreamSourceObserver::MediaStreamSourceObserver(
 
 MediaStreamSourceObserver::~MediaStreamSourceObserver() {
   DCHECK(CalledOnValidThread());
-  if (webrtc_source_)
+  if (webrtc_source_.get())
     webrtc_source_->UnregisterObserver(this);
 }
 
 void MediaStreamSourceObserver::OnChanged() {
   DCHECK(CalledOnValidThread());
   // There should be no more notification after kEnded.
-  DCHECK(webrtc_source_ != NULL);
+  DCHECK(webrtc_source_.get() != NULL);
 
   webrtc::MediaSourceInterface::SourceState state = webrtc_source_->state();
   if (state == state_)
diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc
index c47ba26..5fa4bf9 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.cc
+++ b/content/renderer/media/mock_media_stream_dependency_factory.cc
@@ -273,7 +273,7 @@ void MockLocalVideoTrack::UnregisterObserver(ObserverInterface* observer) {
 }
 
 VideoSourceInterface* MockLocalVideoTrack::GetSource() const {
-  return source_;
+  return source_.get();
 }
 
 std::string MockLocalAudioTrack::kind() const {
diff --git a/content/renderer/media/mock_media_stream_dependency_factory.h b/content/renderer/media/mock_media_stream_dependency_factory.h
index 7b44ac2..9ed1a1a 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.h
+++ b/content/renderer/media/mock_media_stream_dependency_factory.h
@@ -181,8 +181,8 @@ class MockMediaStreamDependencyFactory : public MediaStreamDependencyFactory {
   virtual bool EnsurePeerConnectionFactory() OVERRIDE;
   virtual bool PeerConnectionFactoryCreated() OVERRIDE;
 
-  MockAudioSource* last_audio_source() { return last_audio_source_; }
-  MockVideoSource* last_video_source() { return last_video_source_; }
+  MockAudioSource* last_audio_source() { return last_audio_source_.get(); }
+  MockVideoSource* last_video_source() { return last_video_source_.get(); }
 
  private:
   bool mock_pc_factory_created_;
diff --git a/content/renderer/media/mock_media_stream_registry.cc b/content/renderer/media/mock_media_stream_registry.cc
index e0e2dce..f7a5c89 100644
--- a/content/renderer/media/mock_media_stream_registry.cc
+++ b/content/renderer/media/mock_media_stream_registry.cc
@@ -31,7 +31,7 @@ void MockMediaStreamRegistry::Init(const std::string& stream_url) {
   WebKit::WebString webkit_stream_label(UTF8ToUTF16(stream->label()));
   test_stream_.initialize(webkit_stream_label,
                           webkit_audio_tracks, webkit_video_tracks);
-  test_stream_.setExtraData(new MediaStreamExtraData(stream, false));
+  test_stream_.setExtraData(new MediaStreamExtraData(stream.get(), false));
 }
 
 bool MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) {
diff --git a/content/renderer/media/peer_connection_handler_base.cc b/content/renderer/media/peer_connection_handler_base.cc
index ab09f04..e8cee0e 100644
--- a/content/renderer/media/peer_connection_handler_base.cc
+++ b/content/renderer/media/peer_connection_handler_base.cc
@@ -21,7 +21,7 @@ static webrtc::MediaStreamInterface* GetNativeMediaStream(
   MediaStreamExtraData* extra_data =
       static_cast<MediaStreamExtraData*>(stream.extraData());
   if (extra_data)
-    return extra_data->stream();
+    return extra_data->stream().get();
   return NULL;
 }
 
diff --git a/content/renderer/media/remote_media_stream_impl.cc b/content/renderer/media/remote_media_stream_impl.cc
index da49a04..519675c 100644
--- a/content/renderer/media/remote_media_stream_impl.cc
+++ b/content/renderer/media/remote_media_stream_impl.cc
@@ -25,7 +25,7 @@ class RemoteMediaStreamTrackObserver
   virtual ~RemoteMediaStreamTrackObserver();
 
   webrtc::MediaStreamTrackInterface* observered_track() {
-    return webrtc_track_;
+    return webrtc_track_.get();
   }
   const WebKit::WebMediaStreamTrack& webkit_track() { return webkit_track_; }
 
diff --git a/content/renderer/media/renderer_webaudiodevice_impl.cc b/content/renderer/media/renderer_webaudiodevice_impl.cc
index 43a4a61..3b08159 100644
--- a/content/renderer/media/renderer_webaudiodevice_impl.cc
+++ b/content/renderer/media/renderer_webaudiodevice_impl.cc
@@ -29,13 +29,13 @@ RendererWebAudioDeviceImpl::RendererWebAudioDeviceImpl(
 }
 
 RendererWebAudioDeviceImpl::~RendererWebAudioDeviceImpl() {
-  DCHECK(!output_device_);
+  DCHECK(!output_device_.get());
 }
 
 void RendererWebAudioDeviceImpl::start() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  if (output_device_)
+  if (output_device_.get())
     return;  // Already started.
 
   // Assumption: This method is being invoked within a V8 call stack.  CHECKs
@@ -59,7 +59,7 @@ void RendererWebAudioDeviceImpl::start() {
 void RendererWebAudioDeviceImpl::stop() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  if (output_device_) {
+  if (output_device_.get()) {
     output_device_->Stop();
     output_device_ = NULL;
   }
diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc
index 6680a0a..3dc7463 100644
--- a/content/renderer/media/rtc_peer_connection_handler.cc
+++ b/content/renderer/media/rtc_peer_connection_handler.cc
@@ -229,8 +229,7 @@ class SetSessionDescriptionRequest
 class StatsResponse : public webrtc::StatsObserver {
  public:
   explicit StatsResponse(const scoped_refptr<LocalRTCStatsRequest>& request)
-      : request_(request),
-        response_(request_->createResponse()) {}
+      : request_(request.get()), response_(request_->createResponse()) {}
 
   virtual void OnComplete(
       const std::vector<webrtc::StatsReport>& reports) OVERRIDE {
@@ -360,7 +359,7 @@ bool RTCPeerConnectionHandler::initialize(
   native_peer_connection_ =
       dependency_factory_->CreatePeerConnection(
           servers, &constraints, frame_, this);
-  if (!native_peer_connection_) {
+  if (!native_peer_connection_.get()) {
     LOG(ERROR) << "Failed to initialize native PeerConnection.";
     return false;
   }
@@ -382,7 +381,7 @@ bool RTCPeerConnectionHandler::InitializeForTest(
   native_peer_connection_ =
       dependency_factory_->CreatePeerConnection(
           servers, &constraints, NULL, this);
-  if (!native_peer_connection_) {
+  if (!native_peer_connection_.get()) {
     LOG(ERROR) << "Failed to initialize native PeerConnection.";
     return false;
   }
@@ -397,7 +396,7 @@ void RTCPeerConnectionHandler::createOffer(
       new talk_base::RefCountedObject<CreateSessionDescriptionRequest>(
           request, this, PeerConnectionTracker::ACTION_CREATE_OFFER));
   RTCMediaConstraints constraints(options);
-  native_peer_connection_->CreateOffer(description_request, &constraints);
+  native_peer_connection_->CreateOffer(description_request.get(), &constraints);
 
   if (peer_connection_tracker_)
     peer_connection_tracker_->TrackCreateOffer(this, constraints);
@@ -410,7 +409,8 @@ void RTCPeerConnectionHandler::createAnswer(
       new talk_base::RefCountedObject<CreateSessionDescriptionRequest>(
           request, this, PeerConnectionTracker::ACTION_CREATE_ANSWER));
   RTCMediaConstraints constraints(options);
-  native_peer_connection_->CreateAnswer(description_request, &constraints);
+  native_peer_connection_->CreateAnswer(description_request.get(),
+                                        &constraints);
 
   if (peer_connection_tracker_)
     peer_connection_tracker_->TrackCreateAnswer(this, constraints);
@@ -438,7 +438,7 @@ void RTCPeerConnectionHandler::setLocalDescription(
   scoped_refptr<SetSessionDescriptionRequest> set_request(
       new talk_base::RefCountedObject<SetSessionDescriptionRequest>(
           request, this, PeerConnectionTracker::ACTION_SET_LOCAL_DESCRIPTION));
-  native_peer_connection_->SetLocalDescription(set_request, native_desc);
+  native_peer_connection_->SetLocalDescription(set_request.get(), native_desc);
 }
 
 void RTCPeerConnectionHandler::setRemoteDescription(
@@ -463,7 +463,7 @@ void RTCPeerConnectionHandler::setRemoteDescription(
   scoped_refptr<SetSessionDescriptionRequest> set_request(
       new talk_base::RefCountedObject<SetSessionDescriptionRequest>(
           request, this, PeerConnectionTracker::ACTION_SET_REMOTE_DESCRIPTION));
-  native_peer_connection_->SetRemoteDescription(set_request, native_desc);
+  native_peer_connection_->SetRemoteDescription(set_request.get(), native_desc);
 }
 
 WebKit::WebRTCSessionDescription
@@ -544,7 +544,7 @@ void RTCPeerConnectionHandler::getStats(
     const WebKit::WebRTCStatsRequest& request) {
   scoped_refptr<LocalRTCStatsRequest> inner_request(
       new talk_base::RefCountedObject<LocalRTCStatsRequest>(request));
-  getStats(inner_request);
+  getStats(inner_request.get());
 }
 
 void RTCPeerConnectionHandler::getStats(LocalRTCStatsRequest* request) {
diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
index 40beaec..a0651a6 100644
--- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc
+++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
@@ -87,7 +87,7 @@ class MockRTCStatsRequest : public LocalRTCStatsRequest {
     return component_;
   }
   virtual scoped_refptr<LocalRTCStatsResponse> createResponse() OVERRIDE {
-    DCHECK(!response_);
+    DCHECK(!response_.get());
     response_ = new talk_base::RefCountedObject<MockRTCStatsResponse>();
     return response_;
   }
@@ -244,7 +244,7 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test {
     scoped_refptr<webrtc::AudioTrackInterface> audio_track(
         mock_dependency_factory_->CreateLocalAudioTrack(audio_track_id,
                                                         NULL));
-    native_stream->AddTrack(audio_track);
+    native_stream->AddTrack(audio_track.get());
     WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks;
     local_stream.audioSources(video_tracks);
     const std::string video_track_id = UTF16ToUTF8(video_tracks[0].id());
@@ -252,9 +252,10 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test {
     scoped_refptr<webrtc::VideoTrackInterface> video_track(
         mock_dependency_factory_->CreateLocalVideoTrack(
             video_track_id, source));
-    native_stream->AddTrack(video_track);
+    native_stream->AddTrack(video_track.get());
 
-    local_stream.setExtraData(new MediaStreamExtraData(native_stream, true));
+    local_stream.setExtraData(
+        new MediaStreamExtraData(native_stream.get(), true));
     return local_stream;
   }
 
@@ -271,15 +272,15 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test {
       scoped_refptr<webrtc::VideoTrackInterface> video_track(
           mock_dependency_factory_->CreateLocalVideoTrack(
               video_track_label, source));
-      stream->AddTrack(video_track);
+      stream->AddTrack(video_track.get());
     }
     if (!audio_track_label.empty()) {
       scoped_refptr<webrtc::AudioTrackInterface> audio_track(
           mock_dependency_factory_->CreateLocalAudioTrack(audio_track_label,
                                                           NULL));
-      stream->AddTrack(audio_track);
+      stream->AddTrack(audio_track.get());
     }
-    mock_peer_connection_->AddRemoteStream(stream);
+    mock_peer_connection_->AddRemoteStream(stream.get());
     return stream;
   }
 
@@ -458,7 +459,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithLocalSelector) {
 TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithRemoteSelector) {
   scoped_refptr<webrtc::MediaStreamInterface> stream(
       AddRemoteMockMediaStream("remote_stream", "video", "audio"));
-  pc_handler_->OnAddStream(stream);
+  pc_handler_->OnAddStream(stream.get());
   const WebKit::WebMediaStream& remote_stream = mock_client_->remote_stream();
 
   WebKit::WebVector<WebKit::WebMediaStreamTrack> tracks;
@@ -655,8 +656,8 @@ TEST_F(RTCPeerConnectionHandlerTest, OnAddAndOnRemoveStream) {
       testing::Property(&WebKit::WebMediaStream::label,
                         UTF8ToUTF16(remote_stream_label))));
 
-  pc_handler_->OnAddStream(remote_stream);
-  pc_handler_->OnRemoveStream(remote_stream);
+  pc_handler_->OnAddStream(remote_stream.get());
+  pc_handler_->OnRemoveStream(remote_stream.get());
 }
 
 // This test that WebKit is notified about remote track state changes.
@@ -669,7 +670,7 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoteTrackState) {
   EXPECT_CALL(*mock_client_.get(), didAddRemoteStream(
       testing::Property(&WebKit::WebMediaStream::label,
                         UTF8ToUTF16(remote_stream_label))));
-  pc_handler_->OnAddStream(remote_stream);
+  pc_handler_->OnAddStream(remote_stream.get());
   const WebKit::WebMediaStream& webkit_stream = mock_client_->remote_stream();
 
   WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks;
@@ -701,7 +702,7 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddAudioTrackFromRemoteStream) {
   EXPECT_CALL(*mock_client_.get(), didAddRemoteStream(
       testing::Property(&WebKit::WebMediaStream::label,
                         UTF8ToUTF16(remote_stream_label))));
-  pc_handler_->OnAddStream(remote_stream);
+  pc_handler_->OnAddStream(remote_stream.get());
   const WebKit::WebMediaStream& webkit_stream = mock_client_->remote_stream();
 
   WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks;
@@ -711,13 +712,13 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddAudioTrackFromRemoteStream) {
   // Remove the Webrtc audio track from the Webrtc MediaStream.
   scoped_refptr<webrtc::AudioTrackInterface> webrtc_track =
       remote_stream->GetAudioTracks()[0].get();
-  remote_stream->RemoveTrack(webrtc_track);
+  remote_stream->RemoveTrack(webrtc_track.get());
   WebKit::WebVector<WebKit::WebMediaStreamTrack> modified_audio_tracks1;
   webkit_stream.audioTracks(modified_audio_tracks1);
   EXPECT_EQ(0u, modified_audio_tracks1.size());
 
   // Add the WebRtc audio track again.
-  remote_stream->AddTrack(webrtc_track);
+  remote_stream->AddTrack(webrtc_track.get());
   WebKit::WebVector<WebKit::WebMediaStreamTrack> modified_audio_tracks2;
   webkit_stream.audioTracks(modified_audio_tracks2);
   EXPECT_EQ(1u, modified_audio_tracks2.size());
@@ -731,7 +732,7 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddVideoTrackFromRemoteStream) {
   EXPECT_CALL(*mock_client_.get(), didAddRemoteStream(
       testing::Property(&WebKit::WebMediaStream::label,
                         UTF8ToUTF16(remote_stream_label))));
-  pc_handler_->OnAddStream(remote_stream);
+  pc_handler_->OnAddStream(remote_stream.get());
   const WebKit::WebMediaStream& webkit_stream = mock_client_->remote_stream();
 
   WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks;
@@ -741,13 +742,13 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddVideoTrackFromRemoteStream) {
   // Remove the Webrtc video track from the Webrtc MediaStream.
   scoped_refptr<webrtc::VideoTrackInterface> webrtc_track =
       remote_stream->GetVideoTracks()[0].get();
-  remote_stream->RemoveTrack(webrtc_track);
+  remote_stream->RemoveTrack(webrtc_track.get());
   WebKit::WebVector<WebKit::WebMediaStreamTrack> modified_video_tracks1;
   webkit_stream.videoTracks(modified_video_tracks1);
   EXPECT_EQ(0u, modified_video_tracks1.size());
 
   // Add the WebRtc video track again.
-  remote_stream->AddTrack(webrtc_track);
+  remote_stream->AddTrack(webrtc_track.get());
   WebKit::WebVector<WebKit::WebMediaStreamTrack> modified_video_tracks2;
   webkit_stream.videoTracks(modified_video_tracks2);
   EXPECT_EQ(1u, modified_video_tracks2.size());
diff --git a/content/renderer/media/rtc_video_capture_delegate.cc b/content/renderer/media/rtc_video_capture_delegate.cc
index 975cfde..b6a55e8 100644
--- a/content/renderer/media/rtc_video_capture_delegate.cc
+++ b/content/renderer/media/rtc_video_capture_delegate.cc
@@ -107,7 +107,7 @@ void RtcVideoCaptureDelegate::OnBufferReadyOnCaptureThread(
         state_callback_.Run(CAPTURE_RUNNING);
     }
 
-    captured_callback_.Run(*buf);
+    captured_callback_.Run(*buf.get());
   }
   capture->FeedBuffer(buf);
 }
diff --git a/content/renderer/media/rtc_video_renderer.cc b/content/renderer/media/rtc_video_renderer.cc
index 8edef65..6ec3db7f 100644
--- a/content/renderer/media/rtc_video_renderer.cc
+++ b/content/renderer/media/rtc_video_renderer.cc
@@ -37,7 +37,7 @@ void RTCVideoRenderer::Start() {
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kStopped);
 
-  if (video_track_) {
+  if (video_track_.get()) {
     video_track_->AddRenderer(this);
     video_track_->RegisterObserver(this);
   }
@@ -47,7 +47,7 @@ void RTCVideoRenderer::Start() {
 
 void RTCVideoRenderer::Stop() {
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
-  if (video_track_) {
+  if (video_track_.get()) {
     state_ = kStopped;
     video_track_->RemoveRenderer(this);
     video_track_->UnregisterObserver(this);
@@ -57,14 +57,14 @@ void RTCVideoRenderer::Stop() {
 
 void RTCVideoRenderer::Play() {
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
-  if (video_track_ && state_ == kPaused) {
+  if (video_track_.get() && state_ == kPaused) {
     state_ = kStarted;
   }
 }
 
 void RTCVideoRenderer::Pause() {
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
-  if (video_track_ && state_ == kStarted) {
+  if (video_track_.get() && state_ == kStarted) {
     state_ = kPaused;
   }
 }
@@ -98,9 +98,11 @@ void RTCVideoRenderer::RenderFrame(const cricket::VideoFrame* frame) {
 
   int y_rows = frame->GetHeight();
   int uv_rows = frame->GetHeight() / 2;  // YV12 format.
-  CopyYPlane(frame->GetYPlane(), frame->GetYPitch(), y_rows, video_frame);
-  CopyUPlane(frame->GetUPlane(), frame->GetUPitch(), uv_rows, video_frame);
-  CopyVPlane(frame->GetVPlane(), frame->GetVPitch(), uv_rows, video_frame);
+  CopyYPlane(frame->GetYPlane(), frame->GetYPitch(), y_rows, video_frame.get());
+  CopyUPlane(
+      frame->GetUPlane(), frame->GetUPitch(), uv_rows, video_frame.get());
+  CopyVPlane(
+      frame->GetVPlane(), frame->GetVPitch(), uv_rows, video_frame.get());
 
   message_loop_proxy_->PostTask(
       FROM_HERE, base::Bind(&RTCVideoRenderer::DoRenderFrameOnMainThread,
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index 8f358ca..1382c8f 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -238,7 +238,7 @@ void VideoCaptureImpl::DoFeedBufferOnCaptureThread(
 
   CachedDIB::iterator it;
   for (it = cached_dibs_.begin(); it != cached_dibs_.end(); ++it) {
-    if (buffer == it->second->mapped_memory)
+    if (buffer.get() == it->second->mapped_memory.get())
       break;
   }
 
@@ -292,7 +292,7 @@ void VideoCaptureImpl::DoBufferReceivedOnCaptureThread(
 
   media::VideoCapture::VideoFrameBuffer* buffer;
   DCHECK(cached_dibs_.find(buffer_id) != cached_dibs_.end());
-  buffer = cached_dibs_[buffer_id]->mapped_memory;
+  buffer = cached_dibs_[buffer_id]->mapped_memory.get();
   buffer->timestamp = timestamp;
 
   for (ClientInfo::iterator it = clients_.begin(); it != clients_.end(); ++it) {
diff --git a/content/renderer/media/video_capture_impl_manager.cc b/content/renderer/media/video_capture_impl_manager.cc
index b270296..672fbd4 100644
--- a/content/renderer/media/video_capture_impl_manager.cc
+++ b/content/renderer/media/video_capture_impl_manager.cc
@@ -27,7 +27,7 @@ media::VideoCapture* VideoCaptureImplManager::AddDevice(
   Devices::iterator it = devices_.find(id);
   if (it == devices_.end()) {
     VideoCaptureImpl* vc =
-        new VideoCaptureImpl(id, message_loop_proxy_, filter_);
+        new VideoCaptureImpl(id, message_loop_proxy_.get(), filter_.get());
     devices_[id] = new Device(vc, handler);
     vc->Init();
     return vc;
diff --git a/content/renderer/media/video_capture_impl_manager.h b/content/renderer/media/video_capture_impl_manager.h
index c673960..d22b017 100644
--- a/content/renderer/media/video_capture_impl_manager.h
+++ b/content/renderer/media/video_capture_impl_manager.h
@@ -47,7 +47,7 @@ class CONTENT_EXPORT VideoCaptureImplManager
   virtual void SuspendDevices(bool suspend);
 
   VideoCaptureMessageFilter* video_capture_message_filter() const {
-    return filter_;
+    return filter_.get();
   }
 
  protected:
diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc
index 2e2c739..b158b45 100644
--- a/content/renderer/media/video_capture_impl_unittest.cc
+++ b/content/renderer/media/video_capture_impl_unittest.cc
@@ -63,8 +63,7 @@ class VideoCaptureImplTest : public ::testing::Test {
     MockVideoCaptureImpl(const media::VideoCaptureSessionId id,
                          scoped_refptr<base::MessageLoopProxy> ml_proxy,
                          VideoCaptureMessageFilter* filter)
-        : VideoCaptureImpl(id, ml_proxy, filter) {
-    }
+        : VideoCaptureImpl(id, ml_proxy.get(), filter) {}
     virtual ~MockVideoCaptureImpl() {}
 
     // Override Send() to mimic device to send events.
@@ -111,9 +110,8 @@ class VideoCaptureImplTest : public ::testing::Test {
     message_filter_ = new MockVideoCaptureMessageFilter;
     session_id_ = 1;
 
-    video_capture_impl_ = new MockVideoCaptureImpl(session_id_,
-                                                   message_loop_proxy_,
-                                                   message_filter_);
+    video_capture_impl_ = new MockVideoCaptureImpl(
+        session_id_, message_loop_proxy_, message_filter_.get());
 
     video_capture_impl_->device_id_ = 2;
   }
diff --git a/content/renderer/media/video_destination_handler.cc b/content/renderer/media/video_destination_handler.cc
index 71cfe46..a5ae492 100644
--- a/content/renderer/media/video_destination_handler.cc
+++ b/content/renderer/media/video_destination_handler.cc
@@ -190,7 +190,7 @@ bool VideoDestinationHandler::Open(
   // Gets a handler to the native video track, which owns the |writer|.
   MediaStreamExtraData* extra_data =
       static_cast<MediaStreamExtraData*>(stream.extraData());
-  webrtc::MediaStreamInterface* native_stream = extra_data->stream();
+  webrtc::MediaStreamInterface* native_stream = extra_data->stream().get();
   DCHECK(native_stream);
   VideoTrackVector video_tracks = native_stream->GetVideoTracks();
   // Currently one supports one video track per media stream.
diff --git a/content/renderer/media/video_destination_handler_unittest.cc b/content/renderer/media/video_destination_handler_unittest.cc
index fcb14d3..d14e4b4 100644
--- a/content/renderer/media/video_destination_handler_unittest.cc
+++ b/content/renderer/media/video_destination_handler_unittest.cc
@@ -115,7 +115,7 @@ TEST_F(VideoDestinationHandlerTest, Open) {
   MediaStreamExtraData* extra_data =
       static_cast<MediaStreamExtraData*>(test_stream.extraData());
   DCHECK(extra_data);
-  webrtc::MediaStreamInterface* native_stream = extra_data->stream();
+  webrtc::MediaStreamInterface* native_stream = extra_data->stream().get();
   DCHECK(native_stream);
   webrtc::VideoTrackVector native_video_tracks =
       native_stream->GetVideoTracks();
diff --git a/content/renderer/media/video_source_handler.cc b/content/renderer/media/video_source_handler.cc
index 07f48b3..8748dee 100644
--- a/content/renderer/media/video_source_handler.cc
+++ b/content/renderer/media/video_source_handler.cc
@@ -122,7 +122,7 @@ scoped_refptr<VideoSourceInterface> VideoSourceHandler::GetFirstVideoSource(
     LOG(ERROR) << "GetFirstVideoSource - MediaStreamExtraData is NULL.";
     return source;
   }
-  webrtc::MediaStreamInterface* native_stream = extra_data->stream();
+  webrtc::MediaStreamInterface* native_stream = extra_data->stream().get();
   if (!native_stream) {
     LOG(ERROR) << "GetFirstVideoSource - native stream is NULL.";
     return source;
diff --git a/content/renderer/media/webrtc_audio_capturer.cc b/content/renderer/media/webrtc_audio_capturer.cc
index 47639b7..0f35b4f 100644
--- a/content/renderer/media/webrtc_audio_capturer.cc
+++ b/content/renderer/media/webrtc_audio_capturer.cc
@@ -234,7 +234,7 @@ void WebRtcAudioCapturer::SetCapturerSource(
   scoped_refptr<ConfiguredBuffer> current_buffer;
   {
     base::AutoLock auto_lock(lock_);
-    if (source_ == source)
+    if (source_.get() == source.get())
       return;
 
     source_.swap(old_source);
@@ -245,15 +245,15 @@ void WebRtcAudioCapturer::SetCapturerSource(
     running_ = false;
   }
 
-  const bool no_default_audio_source_exists = !current_buffer;
+  const bool no_default_audio_source_exists = !current_buffer.get();
 
   // Detach the old source from normal recording or perform first-time
   // initialization if Initialize() has never been called. For the second
   // case, the caller is not "taking over an ongoing session" but instead
   // "taking control over a new session".
-  if (old_source || no_default_audio_source_exists) {
+  if (old_source.get() || no_default_audio_source_exists) {
     DVLOG(1) << "New capture source will now be utilized.";
-    if (old_source)
+    if (old_source.get())
       old_source->Stop();
 
     // Dispatch the new parameters both to the sink(s) and to the new source.
@@ -268,7 +268,7 @@ void WebRtcAudioCapturer::SetCapturerSource(
     }
   }
 
-  if (source) {
+  if (source.get()) {
     // Make sure to grab the new parameters in case they were reconfigured.
     source->Initialize(current_buffer->params(), this, session_id_);
   }
@@ -282,7 +282,7 @@ void WebRtcAudioCapturer::Start() {
 
   // Start the data source, i.e., start capturing data from the current source.
   // Note that, the source does not have to be a microphone.
-  if (source_) {
+  if (source_.get()) {
     // We need to set the AGC control before starting the stream.
     source_->SetAutomaticGainControl(agc_is_enabled_);
     source_->Start();
@@ -303,14 +303,14 @@ void WebRtcAudioCapturer::Stop() {
     running_ = false;
   }
 
-  if (source)
+  if (source.get())
     source->Stop();
 }
 
 void WebRtcAudioCapturer::SetVolume(double volume) {
   DVLOG(1) << "WebRtcAudioCapturer::SetVolume()";
   base::AutoLock auto_lock(lock_);
-  if (source_)
+  if (source_.get())
     source_->SetVolume(volume);
 }
 
@@ -320,7 +320,7 @@ void WebRtcAudioCapturer::SetAutomaticGainControl(bool enable) {
   // Initialize(), in this case stored setting will be applied in Start().
   agc_is_enabled_ = enable;
 
-  if (source_)
+  if (source_.get())
     source_->SetAutomaticGainControl(enable);
 }
 
diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc
index d6588fb..5edd967 100644
--- a/content/renderer/media/webrtc_audio_device_impl.cc
+++ b/content/renderer/media/webrtc_audio_device_impl.cc
@@ -220,14 +220,14 @@ int32_t WebRtcAudioDeviceImpl::Init() {
   if (initialized_)
     return 0;
 
-  DCHECK(!capturer_);
+  DCHECK(!capturer_.get());
   capturer_ = WebRtcAudioCapturer::CreateCapturer();
   // Add itself as an audio track to the |capturer_|. This is because WebRTC
   // supports only one ADM but multiple audio tracks, so the ADM can't be the
   // sink of certain audio track now.
   // TODO(xians): Register the ADM as the sink of the audio track if WebRTC
   // supports one ADM for each audio track.
-  if (capturer_)
+  if (capturer_.get())
     capturer_->AddSink(this);
 
   // We need to return a success to continue the initialization of WebRtc VoE
@@ -250,15 +250,15 @@ int32_t WebRtcAudioDeviceImpl::Terminate() {
   StopPlayout();
 
   // It is necessary to stop the |renderer_| before going away.
-  if (renderer_) {
+  if (renderer_.get()) {
     // Grab a local reference while we call Stop(), which will trigger a call to
     // RemoveAudioRenderer that clears our reference to the audio renderer.
     scoped_refptr<WebRtcAudioRenderer> local_renderer(renderer_);
     local_renderer->Stop();
-    DCHECK(!renderer_);
+    DCHECK(!renderer_.get());
   }
 
-  if (capturer_) {
+  if (capturer_.get()) {
     // |capturer_| is stopped by the media stream, so do not need to
     // call Stop() here.
     capturer_->RemoveSink(this);
@@ -283,14 +283,14 @@ bool WebRtcAudioDeviceImpl::PlayoutIsInitialized() const {
 }
 
 int32_t WebRtcAudioDeviceImpl::RecordingIsAvailable(bool* available) {
-  *available = (capturer_ != NULL);
+  *available = (capturer_.get() != NULL);
   return 0;
 }
 
 bool WebRtcAudioDeviceImpl::RecordingIsInitialized() const {
   DVLOG(1) << "WebRtcAudioDeviceImpl::RecordingIsInitialized()";
   DCHECK(thread_checker_.CalledOnValidThread());
-  return (capturer_ != NULL);
+  return (capturer_.get() != NULL);
 }
 
 int32_t WebRtcAudioDeviceImpl::StartPlayout() {
@@ -386,7 +386,7 @@ int32_t WebRtcAudioDeviceImpl::SetAGC(bool enable) {
   // The current implementation does not support changing the AGC state while
   // recording. Using this approach simplifies the design and it is also
   // inline with the  latest WebRTC standard.
-  if (!capturer_ || capturer_->is_recording())
+  if (!capturer_.get() || capturer_->is_recording())
     return -1;
 
   capturer_->SetAutomaticGainControl(enable);
@@ -405,7 +405,7 @@ bool WebRtcAudioDeviceImpl::AGC() const {
 int32_t WebRtcAudioDeviceImpl::SetMicrophoneVolume(uint32_t volume) {
   DVLOG(1) << "WebRtcAudioDeviceImpl::SetMicrophoneVolume(" << volume << ")";
   DCHECK(initialized_);
-  if (!capturer_)
+  if (!capturer_.get())
     return -1;
 
   if (volume > kMaxVolumeLevel)
@@ -426,7 +426,7 @@ int32_t WebRtcAudioDeviceImpl::MicrophoneVolume(uint32_t* volume) const {
   // and cached in the same method, i.e. we don't ask the native audio layer
   // for the actual micropone level here.
   DCHECK(initialized_);
-  if (!capturer_)
+  if (!capturer_.get())
     return -1;
   base::AutoLock auto_lock(lock_);
   *volume = microphone_volume_;
@@ -452,7 +452,7 @@ int32_t WebRtcAudioDeviceImpl::StereoPlayoutIsAvailable(bool* available) const {
 int32_t WebRtcAudioDeviceImpl::StereoRecordingIsAvailable(
     bool* available) const {
   DCHECK(initialized_);
-  if (!capturer_)
+  if (!capturer_.get())
     return -1;
   *available = (input_channels() == 2);
   return 0;
@@ -487,7 +487,7 @@ bool WebRtcAudioDeviceImpl::SetAudioRenderer(WebRtcAudioRenderer* renderer) {
   DCHECK(renderer);
 
   base::AutoLock auto_lock(lock_);
-  if (renderer_)
+  if (renderer_.get())
     return false;
 
   if (!renderer->Initialize(this))
diff --git a/content/renderer/media/webrtc_audio_device_unittest.cc b/content/renderer/media/webrtc_audio_device_unittest.cc
index 222271d..37d5401 100644
--- a/content/renderer/media/webrtc_audio_device_unittest.cc
+++ b/content/renderer/media/webrtc_audio_device_unittest.cc
@@ -105,7 +105,7 @@ bool HardwareSampleRatesAreValid() {
 // HardwareSampleRatesAreValid() has been called and returned true.
 bool InitializeCapturer(WebRtcAudioDeviceImpl* webrtc_audio_device) {
   // Access the capturer owned and created by the audio device.
-  WebRtcAudioCapturer* capturer = webrtc_audio_device->capturer();
+  WebRtcAudioCapturer* capturer = webrtc_audio_device->capturer().get();
   if (!capturer)
     return false;
 
@@ -297,7 +297,7 @@ int RunWebRtcLoopbackTimeTest(media::AudioManager* manager,
   EXPECT_TRUE(engine.valid());
   ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get());
   EXPECT_TRUE(base.valid());
-  int err = base->Init(webrtc_audio_device);
+  int err = base->Init(webrtc_audio_device.get());
   EXPECT_EQ(0, err);
 
   // We use SetCaptureFormat() and SetRenderFormat() to configure the audio
@@ -454,7 +454,7 @@ TEST_F(WebRTCAudioDeviceTest, Construct) {
   ASSERT_TRUE(engine.valid());
 
   ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get());
-  int err = base->Init(webrtc_audio_device);
+  int err = base->Init(webrtc_audio_device.get());
   EXPECT_TRUE(InitializeCapturer(webrtc_audio_device.get()));
   EXPECT_EQ(0, err);
   EXPECT_EQ(0, base->Terminate());
@@ -493,14 +493,14 @@ TEST_F(WebRTCAudioDeviceTest, DISABLED_StartPlayout) {
       new WebRtcAudioRenderer(kRenderViewId);
   scoped_refptr<WebRtcAudioDeviceImpl> webrtc_audio_device(
       new WebRtcAudioDeviceImpl());
-  EXPECT_TRUE(webrtc_audio_device->SetAudioRenderer(renderer));
+  EXPECT_TRUE(webrtc_audio_device->SetAudioRenderer(renderer.get()));
 
   WebRTCAutoDelete<webrtc::VoiceEngine> engine(webrtc::VoiceEngine::Create());
   ASSERT_TRUE(engine.valid());
 
   ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get());
   ASSERT_TRUE(base.valid());
-  int err = base->Init(webrtc_audio_device);
+  int err = base->Init(webrtc_audio_device.get());
   ASSERT_EQ(0, err);
 
   int ch = base->CreateChannel();
@@ -578,7 +578,7 @@ TEST_F(WebRTCAudioDeviceTest, MAYBE_StartRecording) {
 
   ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get());
   ASSERT_TRUE(base.valid());
-  int err = base->Init(webrtc_audio_device);
+  int err = base->Init(webrtc_audio_device.get());
   ASSERT_EQ(0, err);
 
   EXPECT_TRUE(InitializeCapturer(webrtc_audio_device.get()));
@@ -656,14 +656,14 @@ TEST_F(WebRTCAudioDeviceTest, DISABLED_PlayLocalFile) {
       new WebRtcAudioRenderer(kRenderViewId);
   scoped_refptr<WebRtcAudioDeviceImpl> webrtc_audio_device(
       new WebRtcAudioDeviceImpl());
-  EXPECT_TRUE(webrtc_audio_device->SetAudioRenderer(renderer));
+  EXPECT_TRUE(webrtc_audio_device->SetAudioRenderer(renderer.get()));
 
   WebRTCAutoDelete<webrtc::VoiceEngine> engine(webrtc::VoiceEngine::Create());
   ASSERT_TRUE(engine.valid());
 
   ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get());
   ASSERT_TRUE(base.valid());
-  int err = base->Init(webrtc_audio_device);
+  int err = base->Init(webrtc_audio_device.get());
   ASSERT_EQ(0, err);
 
   int ch = base->CreateChannel();
@@ -734,14 +734,14 @@ TEST_F(WebRTCAudioDeviceTest, MAYBE_FullDuplexAudioWithAGC) {
       new WebRtcAudioRenderer(kRenderViewId);
   scoped_refptr<WebRtcAudioDeviceImpl> webrtc_audio_device(
       new WebRtcAudioDeviceImpl());
-  EXPECT_TRUE(webrtc_audio_device->SetAudioRenderer(renderer));
+  EXPECT_TRUE(webrtc_audio_device->SetAudioRenderer(renderer.get()));
 
   WebRTCAutoDelete<webrtc::VoiceEngine> engine(webrtc::VoiceEngine::Create());
   ASSERT_TRUE(engine.valid());
 
   ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get());
   ASSERT_TRUE(base.valid());
-  int err = base->Init(webrtc_audio_device);
+  int err = base->Init(webrtc_audio_device.get());
   ASSERT_EQ(0, err);
 
   EXPECT_TRUE(InitializeCapturer(webrtc_audio_device.get()));
@@ -811,7 +811,7 @@ TEST_F(WebRTCAudioDeviceTest, WebRtcRecordingSetupTime) {
 
   ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get());
   ASSERT_TRUE(base.valid());
-  int err = base->Init(webrtc_audio_device);
+  int err = base->Init(webrtc_audio_device.get());
   ASSERT_EQ(0, err);
 
   EXPECT_TRUE(InitializeCapturer(webrtc_audio_device.get()));
@@ -820,7 +820,7 @@ TEST_F(WebRTCAudioDeviceTest, WebRtcRecordingSetupTime) {
   base::WaitableEvent event(false, false);
   scoped_ptr<MockWebRtcAudioCapturerSink> capturer_sink(
       new MockWebRtcAudioCapturerSink(&event));
-  WebRtcAudioCapturer* capturer = webrtc_audio_device->capturer();
+  WebRtcAudioCapturer* capturer = webrtc_audio_device->capturer().get();
   capturer->AddSink(capturer_sink.get());
 
   int ch = base->CreateChannel();
diff --git a/content/renderer/media/webrtc_audio_renderer.cc b/content/renderer/media/webrtc_audio_renderer.cc
index 5a41aec..626a5dc 100644
--- a/content/renderer/media/webrtc_audio_renderer.cc
+++ b/content/renderer/media/webrtc_audio_renderer.cc
@@ -110,7 +110,7 @@ bool WebRtcAudioRenderer::Initialize(WebRtcAudioRendererSource* source) {
   base::AutoLock auto_lock(lock_);
   DCHECK_EQ(state_, UNINITIALIZED);
   DCHECK(source);
-  DCHECK(!sink_);
+  DCHECK(!sink_.get());
   DCHECK(!source_);
 
   // Use stereo output on all platforms exept Android.
diff --git a/content/renderer/media/webrtc_local_audio_renderer.cc b/content/renderer/media/webrtc_local_audio_renderer.cc
index f76ca50..722191b 100644
--- a/content/renderer/media/webrtc_local_audio_renderer.cc
+++ b/content/renderer/media/webrtc_local_audio_renderer.cc
@@ -98,7 +98,7 @@ WebRtcLocalAudioRenderer::WebRtcLocalAudioRenderer(
 
 WebRtcLocalAudioRenderer::~WebRtcLocalAudioRenderer() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(!sink_);
+  DCHECK(!sink_.get());
   DVLOG(1) << "WebRtcLocalAudioRenderer::~WebRtcLocalAudioRenderer()";
 }
 
@@ -111,7 +111,7 @@ void WebRtcLocalAudioRenderer::Start() {
   audio_track_->AddSink(this);
 
   base::AutoLock auto_lock(thread_lock_);
-  DCHECK(!sink_);
+  DCHECK(!sink_.get());
 
   // TODO(henrika): we could add a more dynamic solution here but I prefer
   // a fixed size combined with bad audio at overflow. The alternative is
@@ -149,7 +149,7 @@ void WebRtcLocalAudioRenderer::Stop() {
   DVLOG(1) << "WebRtcLocalAudioRenderer::Stop()";
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  if (!sink_)
+  if (!sink_.get())
     return;
 
   {
@@ -178,7 +178,7 @@ void WebRtcLocalAudioRenderer::Play() {
   DCHECK(thread_checker_.CalledOnValidThread());
   base::AutoLock auto_lock(thread_lock_);
 
-  if (!sink_)
+  if (!sink_.get())
     return;
 
   // Resumes rendering by ensuring that WebRtcLocalAudioRenderer::Render()
@@ -195,7 +195,7 @@ void WebRtcLocalAudioRenderer::Pause() {
   DCHECK(thread_checker_.CalledOnValidThread());
   base::AutoLock auto_lock(thread_lock_);
 
-  if (!sink_)
+  if (!sink_.get())
     return;
 
   // Temporarily suspends rendering audio.
@@ -208,14 +208,14 @@ void WebRtcLocalAudioRenderer::SetVolume(float volume) {
   DVLOG(1) << "WebRtcLocalAudioRenderer::SetVolume(" << volume << ")";
   DCHECK(thread_checker_.CalledOnValidThread());
   base::AutoLock auto_lock(thread_lock_);
-  if (sink_)
+  if (sink_.get())
     sink_->SetVolume(volume);
 }
 
 base::TimeDelta WebRtcLocalAudioRenderer::GetCurrentRenderTime() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   base::AutoLock auto_lock(thread_lock_);
-  if (!sink_)
+  if (!sink_.get())
     return base::TimeDelta();
   return total_render_time();
 }
diff --git a/content/renderer/media/webrtc_local_audio_track.cc b/content/renderer/media/webrtc_local_audio_track.cc
index 398d8bd..0aa6365 100644
--- a/content/renderer/media/webrtc_local_audio_track.cc
+++ b/content/renderer/media/webrtc_local_audio_track.cc
@@ -28,7 +28,7 @@ WebRtcLocalAudioTrack::WebRtcLocalAudioTrack(
     : webrtc::MediaStreamTrack<webrtc::AudioTrackInterface>(label),
       capturer_(capturer),
       track_source_(track_source) {
-  DCHECK(capturer);
+  DCHECK(capturer.get());
   capturer_->AddSink(this);
   DVLOG(1) << "WebRtcLocalAudioTrack::WebRtcLocalAudioTrack()";
 }
diff --git a/content/renderer/media/webrtc_local_audio_track_unittest.cc b/content/renderer/media/webrtc_local_audio_track_unittest.cc
index 3d11fae..7f7c16d 100644
--- a/content/renderer/media/webrtc_local_audio_track_unittest.cc
+++ b/content/renderer/media/webrtc_local_audio_track_unittest.cc
@@ -32,7 +32,7 @@ class FakeAudioThread : public base::PlatformThread::Delegate {
     : capturer_(capturer),
       thread_(),
       closure_(false, false) {
-    DCHECK(capturer);
+    DCHECK(capturer.get());
     audio_bus_ = media::AudioBus::Create(capturer_->audio_parameters());
   }
 
@@ -45,7 +45,8 @@ class FakeAudioThread : public base::PlatformThread::Delegate {
         return;
 
       media::AudioCapturerSource::CaptureCallback* callback =
-          static_cast<media::AudioCapturerSource::CaptureCallback*>(capturer_);
+          static_cast<media::AudioCapturerSource::CaptureCallback*>(
+              capturer_.get());
       audio_bus_->Zero();
       callback->Capture(audio_bus_.get(), 0, 0);
 
@@ -108,14 +109,14 @@ class WebRtcLocalAudioTrackTest : public ::testing::Test {
   virtual void SetUp() OVERRIDE {
     capturer_ = WebRtcAudioCapturer::CreateCapturer();
     capturer_source_ = new MockCapturerSource();
-    EXPECT_CALL(*capturer_source_, Initialize(_, capturer_.get(), 0))
+    EXPECT_CALL(*capturer_source_.get(), Initialize(_, capturer_.get(), 0))
         .WillOnce(Return());
     capturer_->SetCapturerSource(capturer_source_,
                                  media::CHANNEL_LAYOUT_STEREO,
                                  48000);
 
-    EXPECT_CALL(*capturer_source_, Start()).WillOnce(Return());
-    EXPECT_CALL(*capturer_source_, SetAutomaticGainControl(false))
+    EXPECT_CALL(*capturer_source_.get(), Start()).WillOnce(Return());
+    EXPECT_CALL(*capturer_source_.get(), SetAutomaticGainControl(false))
         .WillOnce(Return());
     capturer_->Start();
     audio_thread_.reset(new FakeAudioThread(capturer_));
@@ -125,7 +126,7 @@ class WebRtcLocalAudioTrackTest : public ::testing::Test {
   virtual void TearDown() {
     audio_thread_->Stop();
     audio_thread_.reset();
-    EXPECT_CALL(*capturer_source_, Stop()).WillOnce(Return());
+    EXPECT_CALL(*capturer_source_.get(), Stop()).WillOnce(Return());
     capturer_->Stop();
   }
 
diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc
index 77ac0ef..a76911b 100644
--- a/content/renderer/p2p/port_allocator.cc
+++ b/content/renderer/p2p/port_allocator.cc
@@ -108,7 +108,7 @@ P2PPortAllocatorSession::P2PPortAllocatorSession(
 }
 
 P2PPortAllocatorSession::~P2PPortAllocatorSession() {
-  if (stun_address_request_)
+  if (stun_address_request_.get())
     stun_address_request_->Cancel();
 }
 
@@ -155,7 +155,7 @@ void P2PPortAllocatorSession::GetPortConfigurations() {
 }
 
 void P2PPortAllocatorSession::ResolveStunServerAddress() {
-  if (stun_address_request_)
+  if (stun_address_request_.get())
     return;
 
   stun_address_request_ =
diff --git a/content/renderer/p2p/socket_client.cc b/content/renderer/p2p/socket_client.cc
index ed3f211..490ebee 100644
--- a/content/renderer/p2p/socket_client.cc
+++ b/content/renderer/p2p/socket_client.cc
@@ -111,7 +111,7 @@ void P2PSocketClient::OnIncomingTcpConnection(const net::IPEndPoint& address) {
   DCHECK_EQ(state_, STATE_OPEN);
 
   scoped_refptr<P2PSocketClient> new_client = new P2PSocketClient(dispatcher_);
-  new_client->socket_id_ = dispatcher_->RegisterClient(new_client);
+  new_client->socket_id_ = dispatcher_->RegisterClient(new_client.get());
   new_client->state_ = STATE_OPEN;
   new_client->delegate_message_loop_ = delegate_message_loop_;
 
@@ -127,7 +127,7 @@ void P2PSocketClient::DeliverOnIncomingTcpConnection(
     const net::IPEndPoint& address, scoped_refptr<P2PSocketClient> new_client) {
   DCHECK(delegate_message_loop_->BelongsToCurrentThread());
   if (delegate_) {
-    delegate_->OnIncomingTcpConnection(address, new_client);
+    delegate_->OnIncomingTcpConnection(address, new_client.get());
   } else {
     // Just close the socket if there is no delegate to accept it.
     new_client->Close();
diff --git a/content/renderer/p2p/socket_dispatcher.cc b/content/renderer/p2p/socket_dispatcher.cc
index 7fe71ee..7bb7444 100644
--- a/content/renderer/p2p/socket_dispatcher.cc
+++ b/content/renderer/p2p/socket_dispatcher.cc
@@ -85,7 +85,7 @@ void P2PSocketDispatcher::OnChannelClosing() {
 }
 
 base::MessageLoopProxy* P2PSocketDispatcher::message_loop() {
-  return message_loop_;
+  return message_loop_.get();
 }
 
 int P2PSocketDispatcher::RegisterClient(P2PSocketClient* client) {
diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc
index 778f4f0..1de9dc2 100644
--- a/content/renderer/pepper/pepper_graphics_2d_host.cc
+++ b/content/renderer/pepper/pepper_graphics_2d_host.cc
@@ -278,7 +278,7 @@ bool PepperGraphics2DHost::ReadImageData(PP_Resource image,
 
   if (image_resource->format() != image_data_->format()) {
     // Convert the image data if the format does not match.
-    ConvertImageData(image_data_, src_irect, image_resource, dest_rect);
+    ConvertImageData(image_data_.get(), src_irect, image_resource, dest_rect);
   } else {
     SkCanvas* dest_canvas = image_resource->GetCanvas();
 
@@ -322,7 +322,7 @@ void PepperGraphics2DHost::Paint(WebKit::WebCanvas* canvas,
                                  const gfx::Rect& plugin_rect,
                                  const gfx::Rect& paint_rect) {
   TRACE_EVENT0("pepper", "PepperGraphics2DHost::Paint");
-  ImageDataAutoMapper auto_mapper(image_data_);
+  ImageDataAutoMapper auto_mapper(image_data_.get());
   const SkBitmap& backing_bitmap = *image_data_->GetMappedBitmap();
 
   gfx::Rect invalidate_rect = plugin_rect;
@@ -563,8 +563,9 @@ int32_t PepperGraphics2DHost::Flush(PP_Resource* old_image_data) {
     gfx::Rect op_rect;
     switch (operation.type) {
       case QueuedOperation::PAINT:
-        ExecutePaintImageData(operation.paint_image,
-                              operation.paint_x, operation.paint_y,
+        ExecutePaintImageData(operation.paint_image.get(),
+                              operation.paint_x,
+                              operation.paint_y,
                               operation.paint_src_rect,
                               &op_rect);
         break;
@@ -578,7 +579,8 @@ int32_t PepperGraphics2DHost::Flush(PP_Resource* old_image_data) {
         // reference, if there are more than one ReplaceContents calls queued
         // the first |old_image_data| will get overwritten and leaked. So we
         // only supply this for the first call.
-        ExecuteReplaceContents(operation.replace_image, &op_rect,
+        ExecuteReplaceContents(operation.replace_image.get(),
+                               &op_rect,
                                done_replace_contents ? NULL : old_image_data);
         done_replace_contents = true;
         break;
@@ -660,7 +662,7 @@ void PepperGraphics2DHost::ExecutePaintImageData(PPB_ImageData_Impl* image,
 
   if (image->format() != image_data_->format()) {
     // Convert the image data if the format does not match.
-    ConvertImageData(image, src_irect, image_data_, dest_rect);
+    ConvertImageData(image, src_irect, image_data_.get(), dest_rect);
   } else {
     // We're guaranteed to have a mapped canvas since we mapped it in Init().
     SkCanvas* backing_canvas = image_data_->GetCanvas();
@@ -693,7 +695,7 @@ void PepperGraphics2DHost::ExecuteReplaceContents(PPB_ImageData_Impl* image,
                          SkIntToScalar(0),
                          SkIntToScalar(image_data_->width()),
                          SkIntToScalar(image_data_->height()) };
-    ConvertImageData(image, src_irect, image_data_, dest_rect);
+    ConvertImageData(image, src_irect, image_data_.get(), dest_rect);
   } else {
     // The passed-in image may not be mapped in our process, and we need to
     // guarantee that the current backing store is always mapped.
diff --git a/content/renderer/pepper/pepper_in_process_resource_creation.cc b/content/renderer/pepper/pepper_in_process_resource_creation.cc
index 0738056..232cc59 100644
--- a/content/renderer/pepper/pepper_in_process_resource_creation.cc
+++ b/content/renderer/pepper/pepper_in_process_resource_creation.cc
@@ -71,10 +71,12 @@ PP_Resource PepperInProcessResourceCreation::CreateFileChooser(
     const PP_Var& accept_types) {
   scoped_refptr<ppapi::StringVar> string_var =
       ppapi::StringVar::FromPPVar(accept_types);
-  std::string str = string_var ? string_var->value() : std::string();
+  std::string str = string_var.get() ? string_var->value() : std::string();
   return (new ppapi::proxy::FileChooserResource(
       host_impl_->in_process_router()->GetPluginConnection(),
-      instance, mode, str.c_str()))->GetReference();
+      instance,
+      mode,
+      str.c_str()))->GetReference();
 }
 
 PP_Resource PepperInProcessResourceCreation::CreateFileIO(
diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.cc b/content/renderer/pepper/pepper_platform_audio_input_impl.cc
index 76afa17..7ec5dc5 100644
--- a/content/renderer/pepper/pepper_platform_audio_input_impl.cc
+++ b/content/renderer/pepper/pepper_platform_audio_input_impl.cc
@@ -82,7 +82,7 @@ void PepperPlatformAudioInputImpl::OnStreamCreated(
   // TODO(yzshen): Make use of circular buffer scheme. crbug.com/181449.
   DCHECK_EQ(1, total_segments);
 
-  if (base::MessageLoopProxy::current() != main_message_loop_proxy_) {
+  if (base::MessageLoopProxy::current() != main_message_loop_proxy_.get()) {
     // If shutdown has occurred, |client_| will be NULL and the handles will be
     // cleaned up on the main thread.
     main_message_loop_proxy_->PostTask(
diff --git a/content/renderer/pepper/pepper_platform_context_3d_impl.cc b/content/renderer/pepper/pepper_platform_context_3d_impl.cc
index ffa3d2d8..b9856da 100644
--- a/content/renderer/pepper/pepper_platform_context_3d_impl.cc
+++ b/content/renderer/pepper/pepper_platform_context_3d_impl.cc
@@ -53,7 +53,7 @@ bool PlatformContext3DImpl::Init(const int32* attrib_list,
 
   channel_ = render_thread->EstablishGpuChannelSync(
       CAUSE_FOR_GPU_LAUNCH_PEPPERPLATFORMCONTEXT3DIMPL_INITIALIZE);
-  if (!channel_)
+  if (!channel_.get())
     return false;
   DCHECK(channel_->state() == GpuChannelHost::kConnected);
 
@@ -120,15 +120,14 @@ bool PlatformContext3DImpl::Init(const int32* attrib_list,
 }
 
 bool PlatformContext3DImpl::SetParentAndCreateBackingTextureIfNeeded() {
-  if (parent_context_provider_ &&
-      !parent_context_provider_->DestroyedOnMainThread() &&
-      parent_texture_id_)
+  if (parent_context_provider_.get() &&
+      !parent_context_provider_->DestroyedOnMainThread() && parent_texture_id_)
     return true;
 
   parent_context_provider_ =
       RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
   parent_texture_id_ = 0;
-  if (!parent_context_provider_)
+  if (!parent_context_provider_.get())
     return false;
 
   // Flush any remaining commands in the parent context to make sure the
@@ -147,7 +146,7 @@ bool PlatformContext3DImpl::SetParentAndCreateBackingTextureIfNeeded() {
 }
 
 void PlatformContext3DImpl::DestroyParentContextProviderAndBackingTexture() {
-  if (!parent_context_provider_)
+  if (!parent_context_provider_.get())
     return;
 
   if (parent_texture_id_) {
@@ -169,7 +168,7 @@ unsigned PlatformContext3DImpl::GetBackingTextureId() {
 }
 
 WebKit::WebGraphicsContext3D* PlatformContext3DImpl::GetParentContext() {
-  if (!parent_context_provider_)
+  if (!parent_context_provider_.get())
     return NULL;
   return parent_context_provider_->Context3d();
 }
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
index 766e0c4..2b0bcda 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
@@ -346,7 +346,7 @@ WebKit::WebPlugin* PepperPluginDelegateImpl::CreatePepperWebPlugin(
       CreatePepperPluginModule(webplugin_info, &pepper_plugin_was_registered));
 
   if (pepper_plugin_was_registered) {
-    if (!pepper_module)
+    if (!pepper_module.get())
       return NULL;
     return new webkit::ppapi::WebPluginImpl(
         pepper_module.get(), params, AsWeakPtr());
@@ -365,12 +365,12 @@ PepperPluginDelegateImpl::CreatePepperPluginModule(
   base::FilePath path(webplugin_info.path);
   scoped_refptr<webkit::ppapi::PluginModule> module =
       PepperPluginRegistry::GetInstance()->GetLiveModule(path);
-  if (module) {
+  if (module.get()) {
     if (!module->GetEmbedderState()) {
       // If the module exists and no embedder state was associated with it,
       // then the module was one of the ones preloaded and is an in-process
       // plugin. We need to associate our host state with it.
-      CreateHostForInProcessModule(render_view_, module, webplugin_info);
+      CreateHostForInProcessModule(render_view_, module.get(), webplugin_info);
     }
     return module;
   }
@@ -408,9 +408,9 @@ PepperPluginDelegateImpl::CreatePepperPluginModule(
       info->name, path,
       PepperPluginRegistry::GetInstance(),
       permissions);
-  PepperPluginRegistry::GetInstance()->AddLiveModule(path, module);
+  PepperPluginRegistry::GetInstance()->AddLiveModule(path, module.get());
 
-  if (!CreateOutOfProcessModule(module,
+  if (!CreateOutOfProcessModule(module.get(),
                                 path,
                                 permissions,
                                 channel_handle,
@@ -431,7 +431,7 @@ RendererPpapiHost* PepperPluginDelegateImpl::CreateExternalPluginModule(
     int plugin_child_id) {
   // We don't call PepperPluginRegistry::AddLiveModule, as this module is
   // managed externally.
-  return CreateOutOfProcessModule(module,
+  return CreateOutOfProcessModule(module.get(),
                                   path,
                                   permissions,
                                   channel_handle,
@@ -898,9 +898,9 @@ PepperPluginDelegateImpl::ConnectToBroker(
 
   scoped_refptr<PepperBrokerImpl> broker =
       static_cast<PepperBrokerImpl*>(plugin_module->GetBroker());
-  if (!broker) {
+  if (!broker.get()) {
     broker = CreateBroker(plugin_module);
-    if (!broker)
+    if (!broker.get())
       return NULL;
   }
 
@@ -919,7 +919,7 @@ PepperPluginDelegateImpl::ConnectToBroker(
   // |broker| goes out of scope.
   broker->AddPendingConnect(client);
 
-  return broker;
+  return broker.get();
 }
 
 void PepperPluginDelegateImpl::OnPpapiBrokerPermissionResult(
diff --git a/content/renderer/pepper/pepper_video_capture_host.cc b/content/renderer/pepper/pepper_video_capture_host.cc
index de3642c..e2951c1 100644
--- a/content/renderer/pepper/pepper_video_capture_host.cc
+++ b/content/renderer/pepper/pepper_video_capture_host.cc
@@ -250,7 +250,7 @@ int32_t PepperVideoCaptureHost::OnOpen(
     const std::string& device_id,
     const PP_VideoCaptureDeviceInfo_Dev& requested_info,
     uint32_t buffer_count) {
-  if (platform_video_capture_)
+  if (platform_video_capture_.get())
     return PP_ERROR_FAILED;
 
   webkit::ppapi::PluginDelegate* plugin_delegate = GetPluginDelegate();
@@ -322,7 +322,7 @@ int32_t PepperVideoCaptureHost::StopCapture() {
 }
 
 int32_t PepperVideoCaptureHost::Close() {
-  if (!platform_video_capture_)
+  if (!platform_video_capture_.get())
     return PP_OK;
 
   StopCapture();
@@ -360,7 +360,7 @@ void PepperVideoCaptureHost::SetRequestedInfo(
 }
 
 void PepperVideoCaptureHost::DetachPlatformVideoCapture() {
-  if (platform_video_capture_) {
+  if (platform_video_capture_.get()) {
     platform_video_capture_->DetachEventHandler();
     platform_video_capture_ = NULL;
   }
diff --git a/content/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc
index b49b093..118dc5e 100644
--- a/content/renderer/plugin_channel_host.cc
+++ b/content/renderer/plugin_channel_host.cc
@@ -144,7 +144,7 @@ bool PluginChannelHost::Init(base::MessageLoopProxy* ipc_message_loop,
       NPChannelBase::Init(ipc_message_loop, create_pipe_now, shutdown_event);
   if (ret) {
     is_listening_filter_ = new IsListeningFilter;
-    channel_->AddFilter(is_listening_filter_);
+    channel_->AddFilter(is_listening_filter_.get());
   }
   return ret;
 }
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 24ac0d2..8e44086 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -373,7 +373,7 @@ void RenderThreadImpl::Init() {
   AddObserver(peer_connection_tracker_.get());
 
   p2p_socket_dispatcher_ = new P2PSocketDispatcher(GetIOMessageLoopProxy());
-  AddFilter(p2p_socket_dispatcher_);
+  AddFilter(p2p_socket_dispatcher_.get());
 #endif  // defined(ENABLE_WEBRTC)
   vc_manager_ = new VideoCaptureImplManager();
   AddFilter(vc_manager_->video_capture_message_filter());
@@ -427,7 +427,7 @@ void RenderThreadImpl::Shutdown() {
     web_database_observer_impl_->WaitForAllDatabasesToClose();
 
   // Shutdown in reverse of the initialization order.
-  if (devtools_agent_message_filter_) {
+  if (devtools_agent_message_filter_.get()) {
     RemoveFilter(devtools_agent_message_filter_.get());
     devtools_agent_message_filter_ = NULL;
   }
@@ -447,7 +447,7 @@ void RenderThreadImpl::Shutdown() {
   if (file_thread_)
     file_thread_->Stop();
 
-  if (compositor_output_surface_filter_) {
+  if (compositor_output_surface_filter_.get()) {
     RemoveFilter(compositor_output_surface_filter_.get());
     compositor_output_surface_filter_ = NULL;
   }
@@ -471,7 +471,7 @@ void RenderThreadImpl::Shutdown() {
 
   // Leak shared contexts on other threads, as we can not get to the correct
   // thread to destroy them.
-  if (shared_contexts_compositor_thread_)
+  if (shared_contexts_compositor_thread_.get())
     shared_contexts_compositor_thread_->set_leak_on_destroy();
 }
 
@@ -777,7 +777,7 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
     output_surface_loop = base::MessageLoopProxy::current();
 
   compositor_output_surface_filter_ =
-      CompositorOutputSurface::CreateFilter(output_surface_loop);
+      CompositorOutputSurface::CreateFilter(output_surface_loop.get());
   AddFilter(compositor_output_surface_filter_.get());
 
   WebScriptController::enableV8SingleThreadMode();
@@ -1005,11 +1005,11 @@ scoped_refptr<ContextProviderCommandBuffer>
 RenderThreadImpl::OffscreenContextProviderForMainThread() {
   DCHECK(IsMainThread());
 
-  if (!shared_contexts_main_thread_ ||
+  if (!shared_contexts_main_thread_.get() ||
       shared_contexts_main_thread_->DestroyedOnMainThread()) {
     shared_contexts_main_thread_ =
         RendererContextProviderCommandBuffer::Create();
-    if (shared_contexts_main_thread_ &&
+    if (shared_contexts_main_thread_.get() &&
         !shared_contexts_main_thread_->BindToCurrentThread())
       shared_contexts_main_thread_ = NULL;
   }
@@ -1020,7 +1020,7 @@ scoped_refptr<ContextProviderCommandBuffer>
 RenderThreadImpl::OffscreenContextProviderForCompositorThread() {
   DCHECK(IsMainThread());
 
-  if (!shared_contexts_compositor_thread_ ||
+  if (!shared_contexts_compositor_thread_.get() ||
       shared_contexts_compositor_thread_->DestroyedOnMainThread()) {
     shared_contexts_compositor_thread_ =
         RendererContextProviderCommandBuffer::Create();
@@ -1210,7 +1210,7 @@ GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync(
     CauseForGpuLaunch cause_for_gpu_launch) {
   TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync");
 
-  if (gpu_channel_) {
+  if (gpu_channel_.get()) {
     // Do nothing if we already have a GPU channel or are already
     // establishing one.
     if (gpu_channel_->state() == GpuChannelHost::kUnconnected ||
@@ -1274,14 +1274,14 @@ RenderThreadImpl::GetMediaStreamDependencyFactory() {
 #if defined(ENABLE_WEBRTC)
   if (!media_stream_factory_) {
     media_stream_factory_.reset(new MediaStreamDependencyFactory(
-        vc_manager_, p2p_socket_dispatcher_));
+        vc_manager_.get(), p2p_socket_dispatcher_.get()));
   }
 #endif
   return media_stream_factory_.get();
 }
 
 GpuChannelHost* RenderThreadImpl::GetGpuChannel() {
-  if (!gpu_channel_)
+  if (!gpu_channel_.get())
     return NULL;
 
   if (gpu_channel_->state() != GpuChannelHost::kConnected)
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 36481be..9d54f6c 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2083,7 +2083,7 @@ WebView* RenderViewImpl::createView(
       routing_id_,
       renderer_preferences_,
       transferred_preferences,
-      shared_popup_counter_,
+      shared_popup_counter_.get(),
       routing_id,
       main_frame_routing_id,
       surface_id,
@@ -2827,7 +2827,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
   if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
     sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()->
         CreateInput(routing_id_);
-    DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink;
+    DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get();
   }
 
   scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories;
@@ -2837,7 +2837,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
   if (context3d) {
     scoped_refptr<base::MessageLoopProxy> factories_loop =
         RenderThreadImpl::current()->compositor_message_loop_proxy();
-    if (!factories_loop)
+    if (!factories_loop.get())
       factories_loop = base::MessageLoopProxy::current();
     GpuChannelHost* gpu_channel_host =
         RenderThreadImpl::current()->EstablishGpuChannelSync(
@@ -4148,9 +4148,9 @@ void RenderViewImpl::CheckPreferredSize() {
 }
 
 BrowserPluginManager* RenderViewImpl::GetBrowserPluginManager() {
-  if (!browser_plugin_manager_)
+  if (!browser_plugin_manager_.get())
     browser_plugin_manager_ = BrowserPluginManager::Create(this);
-  return browser_plugin_manager_;
+  return browser_plugin_manager_.get();
 }
 
 void RenderViewImpl::EnsureMediaStreamImpl() {
@@ -5986,7 +5986,7 @@ void RenderViewImpl::OnSetFocus(bool enable) {
   // Notify all Pepper plugins.
   pepper_helper_->OnSetFocus(enable);
   // Notify all BrowserPlugins of the RenderView's focus state.
-  if (browser_plugin_manager_)
+  if (browser_plugin_manager_.get())
     browser_plugin_manager_->UpdateFocusState();
 }
 
@@ -6133,7 +6133,7 @@ void RenderViewImpl::SetDeviceScaleFactor(float device_scale_factor) {
   if (auto_resize_mode_)
     AutoResizeCompositor();
 
-  if (browser_plugin_manager_)
+  if (browser_plugin_manager_.get())
     browser_plugin_manager_->UpdateDeviceScaleFactor(device_scale_factor_);
 }
 
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 81dc917..e2f00e2 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -215,7 +215,7 @@ RenderWidget* RenderWidget::Create(int32 opener_id,
   scoped_refptr<RenderWidget> widget(
       new RenderWidget(popup_type, screen_info, false));
   if (widget->Init(opener_id)) {  // adds reference on success.
-    return widget;
+    return widget.get();
   }
   return NULL;
 }
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 80c8b53..4efc1fa 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -229,7 +229,7 @@ WebKit::WebMimeRegistry* RendererWebKitPlatformSupportImpl::mimeRegistry() {
 WebKit::WebFileUtilities*
 RendererWebKitPlatformSupportImpl::fileUtilities() {
   if (!file_utilities_) {
-    file_utilities_.reset(new FileUtilities(thread_safe_sender_));
+    file_utilities_.reset(new FileUtilities(thread_safe_sender_.get()));
     file_utilities_->set_sandbox_enabled(sandboxEnabled());
   }
   return file_utilities_.get();
@@ -764,8 +764,8 @@ void RendererWebKitPlatformSupportImpl::screenColorProfile(
 
 WebBlobRegistry* RendererWebKitPlatformSupportImpl::blobRegistry() {
   // thread_safe_sender_ can be NULL when running some tests.
-  if (!blob_registry_.get() && thread_safe_sender_)
-    blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_));
+  if (!blob_registry_.get() && thread_safe_sender_.get())
+    blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get()));
   return blob_registry_.get();
 }
 
@@ -890,12 +890,12 @@ RendererWebKitPlatformSupportImpl::createOffscreenGraphicsContext3D(
 
 WebKit::WebGraphicsContext3DProvider* RendererWebKitPlatformSupportImpl::
     createSharedOffscreenGraphicsContext3DProvider() {
-  if (!shared_offscreen_context_ ||
+  if (!shared_offscreen_context_.get() ||
       shared_offscreen_context_->DestroyedOnMainThread()) {
     shared_offscreen_context_ =
         RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
   }
-  if (!shared_offscreen_context_)
+  if (!shared_offscreen_context_.get())
     return NULL;
   return new webkit::gpu::WebGraphicsContext3DProviderImpl(
       shared_offscreen_context_);
diff --git a/content/renderer/skia_benchmarking_extension.cc b/content/renderer/skia_benchmarking_extension.cc
index c22f4a8..c869576 100644
--- a/content/renderer/skia_benchmarking_extension.cc
+++ b/content/renderer/skia_benchmarking_extension.cc
@@ -75,7 +75,7 @@ class SkiaBenchmarkingWrapper : public v8::Extension {
 
     scoped_refptr<cc::Picture> picture =
         cc::Picture::CreateFromValue(picture_value.get());
-    if (!picture)
+    if (!picture.get())
       return v8::Undefined();
 
     float scale = 1.0f;
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 03026b4..caa182d 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -125,9 +125,9 @@ class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient {
 
   // PluginResourceClient implementation:
   virtual void WillSendRequest(const GURL& url, int http_status_code) OVERRIDE {
-    DCHECK(channel_ != NULL);
-    channel_->Send(new PluginMsg_WillSendRequest(instance_id_, resource_id_,
-                                                 url, http_status_code));
+    DCHECK(channel_.get() != NULL);
+    channel_->Send(new PluginMsg_WillSendRequest(
+        instance_id_, resource_id_, url, http_status_code));
   }
 
   virtual void DidReceiveResponse(const std::string& mime_type,
@@ -135,7 +135,7 @@ class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient {
                                   uint32 expected_length,
                                   uint32 last_modified,
                                   bool request_is_seekable) OVERRIDE {
-    DCHECK(channel_ != NULL);
+    DCHECK(channel_.get() != NULL);
     PluginMsg_DidReceiveResponseParams params;
     params.id = resource_id_;
     params.mime_type = mime_type;
@@ -152,7 +152,7 @@ class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient {
   virtual void DidReceiveData(const char* buffer,
                               int length,
                               int data_offset) OVERRIDE {
-    DCHECK(channel_ != NULL);
+    DCHECK(channel_.get() != NULL);
     DCHECK_GT(length, 0);
     std::vector<char> data;
     data.resize(static_cast<size_t>(length));
@@ -165,14 +165,14 @@ class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient {
   }
 
   virtual void DidFinishLoading() OVERRIDE {
-    DCHECK(channel_ != NULL);
+    DCHECK(channel_.get() != NULL);
     channel_->Send(new PluginMsg_DidFinishLoading(instance_id_, resource_id_));
     channel_ = NULL;
     base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   }
 
   virtual void DidFail() OVERRIDE {
-    DCHECK(channel_ != NULL);
+    DCHECK(channel_.get() != NULL);
     channel_->Send(new PluginMsg_DidFail(instance_id_, resource_id_));
     channel_ = NULL;
     base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
@@ -250,7 +250,7 @@ void WebPluginDelegateProxy::PluginDestroyed() {
   if (render_view_)
     render_view_->UnregisterPluginDelegate(this);
 
-  if (channel_host_) {
+  if (channel_host_.get()) {
     Send(new PluginMsg_DestroyInstance(instance_id_));
 
     // Must remove the route after sending the destroy message, since
@@ -334,7 +334,7 @@ bool WebPluginDelegateProxy::Initialize(
     channel_host =
         PluginChannelHost::GetPluginChannelHost(
             channel_handle, ChildProcess::current()->io_message_loop_proxy());
-    if (!channel_host) {
+    if (!channel_host.get()) {
       LOG(ERROR) << "Couldn't get PluginChannelHost";
       continue;
     }
@@ -386,7 +386,7 @@ bool WebPluginDelegateProxy::Initialize(
 }
 
 bool WebPluginDelegateProxy::Send(IPC::Message* msg) {
-  if (!channel_host_) {
+  if (!channel_host_.get()) {
     DLOG(WARNING) << "dropping message because channel host is null";
     delete msg;
     return false;
@@ -680,7 +680,7 @@ void WebPluginDelegateProxy::Paint(WebKit::WebCanvas* canvas,
 
   // If the plugin is no longer connected (channel crashed) draw a crashed
   // plugin bitmap
-  if (!channel_host_ || !channel_host_->channel_valid()) {
+  if (!channel_host_.get() || !channel_host_->channel_valid()) {
     PaintSadPlugin(canvas, rect);
     return;
   }
@@ -1106,11 +1106,11 @@ void WebPluginDelegateProxy::OnHandleURLRequest(
 webkit::npapi::WebPluginResourceClient*
 WebPluginDelegateProxy::CreateResourceClient(
     unsigned long resource_id, const GURL& url, int notify_id) {
-  if (!channel_host_)
+  if (!channel_host_.get())
     return NULL;
 
-  ResourceClientProxy* proxy = new ResourceClientProxy(channel_host_,
-                                                       instance_id_);
+  ResourceClientProxy* proxy =
+      new ResourceClientProxy(channel_host_.get(), instance_id_);
   proxy->Initialize(resource_id, url, notify_id);
   return proxy;
 }
@@ -1118,11 +1118,11 @@ WebPluginDelegateProxy::CreateResourceClient(
 webkit::npapi::WebPluginResourceClient*
 WebPluginDelegateProxy::CreateSeekableResourceClient(
     unsigned long resource_id, int range_request_id) {
-  if (!channel_host_)
+  if (!channel_host_.get())
     return NULL;
 
-  ResourceClientProxy* proxy = new ResourceClientProxy(channel_host_,
-                                                       instance_id_);
+  ResourceClientProxy* proxy =
+      new ResourceClientProxy(channel_host_.get(), instance_id_);
   proxy->InitializeForSeekableStream(resource_id, range_request_id);
   return proxy;
 }
diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc
index f2a9bdd..b3228a0 100644
--- a/content/shell/shell_browser_context.cc
+++ b/content/shell/shell_browser_context.cc
@@ -113,7 +113,7 @@ bool ShellBrowserContext::IsOffTheRecord() const {
 DownloadManagerDelegate* ShellBrowserContext::GetDownloadManagerDelegate()  {
   DownloadManager* manager = BrowserContext::GetDownloadManager(this);
 
-  if (!download_manager_delegate_) {
+  if (!download_manager_delegate_.get()) {
     download_manager_delegate_ = new ShellDownloadManagerDelegate();
     download_manager_delegate_->SetDownloadManager(manager);
     CommandLine* cmd_line = CommandLine::ForCurrentProcess();
@@ -132,7 +132,7 @@ net::URLRequestContextGetter* ShellBrowserContext::GetRequestContext()  {
 
 net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
     ProtocolHandlerMap* protocol_handlers) {
-  DCHECK(!url_request_getter_);
+  DCHECK(!url_request_getter_.get());
   url_request_getter_ = new ShellURLRequestContextGetter(
       ignore_certificate_errors_,
       GetPath(),
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;
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index 931b756..b5df064 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -96,7 +96,7 @@ WebFileSystem* WorkerWebKitPlatformSupportImpl::fileSystem() {
 
 WebFileUtilities* WorkerWebKitPlatformSupportImpl::fileUtilities() {
   if (!file_utilities_) {
-    file_utilities_.reset(new FileUtilities(thread_safe_sender_));
+    file_utilities_.reset(new FileUtilities(thread_safe_sender_.get()));
     file_utilities_->set_sandbox_enabled(sandboxEnabled());
   }
   return file_utilities_.get();
@@ -282,8 +282,8 @@ WebString WorkerWebKitPlatformSupportImpl::preferredExtensionForMIMEType(
 }
 
 WebBlobRegistry* WorkerWebKitPlatformSupportImpl::blobRegistry() {
-  if (!blob_registry_.get() && thread_safe_sender_)
-    blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_));
+  if (!blob_registry_.get() && thread_safe_sender_.get())
+    blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get()));
   return blob_registry_.get();
 }