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

Fixes a number of cases either not caught by the automated tool or that have
recently regressed.

BUG=206189
TBR=darin

Review URL: https://codereview.chromium.org/18346006

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

38 files changed, 203 insertions, 166 deletions

diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
index 29d7818..ef4768f 100644
--- a/cc/resources/picture_layer_tiling.cc
+++ b/cc/resources/picture_layer_tiling.cc
@@ -50,7 +50,7 @@ PictureLayerTiling::PictureLayerTiling(float contents_scale,
 
 PictureLayerTiling::~PictureLayerTiling() {
   for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
-    client_->DestroyTile(it->second);
+    client_->DestroyTile(it->second.get());
 }
 
 void PictureLayerTiling::SetClient(PictureLayerTilingClient* client) {
@@ -338,7 +338,7 @@ gfx::Size PictureLayerTiling::CoverageIterator::texture_size() const {
 void PictureLayerTiling::Reset() {
   live_tiles_rect_ = gfx::Rect();
   for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
-    client_->DestroyTile(it->second);
+    client_->DestroyTile(it->second.get());
   tiles_.clear();
 }
 
@@ -510,7 +510,7 @@ void PictureLayerTiling::SetLiveTilesRect(
     // though it was in the live rect.
     if (found == tiles_.end())
       continue;
-    client_->DestroyTile(found->second);
+    client_->DestroyTile(found->second.get());
     tiles_.erase(found);
   }
 
diff --git a/chrome/app/chrome_main_app_mode_mac.mm b/chrome/app/chrome_main_app_mode_mac.mm
index 8f00c1d..812e985 100644
--- a/chrome/app/chrome_main_app_mode_mac.mm
+++ b/chrome/app/chrome_main_app_mode_mac.mm
@@ -111,7 +111,7 @@ void AppShimController::Init() {
       user_data_dir.Append(app_mode::kAppShimSocketName);
   IPC::ChannelHandle handle(socket_path.value());
   channel_ = new IPC::ChannelProxy(handle, IPC::Channel::MODE_NAMED_CLIENT,
-      this, g_io_thread->message_loop_proxy());
+      this, g_io_thread->message_loop_proxy().get());
 
   channel_->Send(new AppShimHostMsg_LaunchApp(
       g_info->profile_dir, g_info->app_mode_id,
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 63c42b6..f225337 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -1328,7 +1328,7 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
                applications.begin();
            cursor != applications.end();
            ++cursor, ++position) {
-        DCHECK_EQ(applications.GetPosition(*cursor), position);
+        DCHECK_EQ(applications.GetPosition(cursor->get()), position);
         NSString* itemStr =
             base::SysUTF16ToNSString(UTF8ToUTF16((*cursor)->name()));
         base::scoped_nsobject<NSMenuItem> appItem(
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index d00b8f8..f1a6f65 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -1867,7 +1867,7 @@ void MetricsService::StartExternalMetrics() {
 #endif
 
 bool MetricsService::GzipProtobufsBeforeUploading() {
-  if (!gzipped_protobufs_trial_) {
+  if (!gzipped_protobufs_trial_.get()) {
     gzipped_protobufs_trial_ = base::FieldTrialList::FactoryGetFieldTrial(
         kGzippedProtobufsTrialName,
         kGzippedProtobufsTrialDivisor,
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
index 995ac55..c8c5429 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
@@ -44,7 +44,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
   virtual ~TestAutofillDialogController() {}
 
   virtual void ViewClosed() OVERRIDE {
-    DCHECK(runner_);
+    DCHECK(runner_.get());
     runner_->Quit();
     AutofillDialogControllerImpl::ViewClosed();
   }
@@ -92,7 +92,7 @@ class AutofillDialogCocoaBrowserTest : public InProcessBrowserTest {
   TestAutofillDialogController* controller() { return controller_; }
 
   void RunMessageLoop() {
-    DCHECK(runner_);
+    DCHECK(runner_.get());
     runner_->Run();
   }
 
diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm b/chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm
index 1c665f5..0840e8a 100644
--- a/chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm
@@ -39,7 +39,7 @@ IN_PROC_BROWSER_TEST_F(SSLCertificateViewerCocoaTest, Basic) {
       WebContentsModalDialogManager::FromWebContents(web_contents);
   EXPECT_FALSE(web_contents_modal_dialog_manager->IsShowingDialog());
 
-  ShowCertificateViewer(web_contents, window, cert);
+  ShowCertificateViewer(web_contents, window, cert.get());
 
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());
@@ -59,7 +59,7 @@ IN_PROC_BROWSER_TEST_F(SSLCertificateViewerCocoaTest, HideShow) {
       browser()->tab_strip_model()->GetActiveWebContents();
 
   SSLCertificateViewerCocoa* viewer =
-      [[SSLCertificateViewerCocoa alloc] initWithCertificate:cert];
+      [[SSLCertificateViewerCocoa alloc] initWithCertificate:cert.get()];
   [viewer displayForWebContents:web_contents];
 
   content::RunAllPendingInMessageLoop();
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
index 93e537c..424c512 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
@@ -243,7 +243,7 @@ void CollectedCookiesMac::OnConstrainedWindowClosed(
     CookieTreeHostNode* host_node =
         static_cast<CookieTreeHostNode*>(cookie);
     host_node->CreateContentException(
-        CookieSettings::Factory::GetForProfile(profile), setting);
+        CookieSettings::Factory::GetForProfile(profile).get(), setting);
     if (!lastDomain.empty())
       multipleDomainsChanged = YES;
     lastDomain = host_node->GetTitle();
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
index 4f05f5a6..e551c4b 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -487,10 +487,10 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
   for (ExtensionList::const_iterator iter =
            toolbarModel_->toolbar_items().begin();
        iter != toolbarModel_->toolbar_items().end(); ++iter) {
-    if (![self shouldDisplayBrowserAction:*iter])
+    if (![self shouldDisplayBrowserAction:iter->get()])
       continue;
 
-    [self createActionButtonForExtension:*iter withIndex:i++];
+    [self createActionButtonForExtension:iter->get() withIndex:i++];
   }
 
   CGFloat width = [self savedWidth];
@@ -579,9 +579,9 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
   for (ExtensionList::const_iterator iter =
            toolbarModel_->toolbar_items().begin();
        iter != toolbarModel_->toolbar_items().end(); ++iter) {
-    if (![self shouldDisplayBrowserAction:*iter])
+    if (![self shouldDisplayBrowserAction:iter->get()])
       continue;
-    BrowserActionButton* button = [self buttonForExtension:(*iter)];
+    BrowserActionButton* button = [self buttonForExtension:(iter->get())];
     if (!button)
       continue;
     if (![button isBeingDragged])
@@ -672,7 +672,7 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
   for (ExtensionList::const_iterator iter =
            toolbarModel_->toolbar_items().begin();
        iter != toolbarModel_->toolbar_items().end(); ++iter) {
-    BrowserActionButton* button = [self buttonForExtension:(*iter)];
+    BrowserActionButton* button = [self buttonForExtension:(iter->get())];
     NSRect buttonFrame = [button frame];
     if (NSContainsRect([containerView_ bounds], buttonFrame))
       continue;
@@ -712,7 +712,7 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
   for (ExtensionList::const_iterator iter =
            toolbarModel_->toolbar_items().begin();
        iter != toolbarModel_->toolbar_items().end(); ++iter) {
-    BrowserActionButton* button = [self buttonForExtension:(*iter)];
+    BrowserActionButton* button = [self buttonForExtension:(iter->get())];
     CGFloat intersectionWidth =
         NSWidth(NSIntersectionRect(draggedButtonFrame, [button frame]));
 
@@ -878,7 +878,7 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
   const extensions::ExtensionList& toolbar_items =
       toolbarModel_->toolbar_items();
   if (index < toolbar_items.size()) {
-    const Extension* extension = toolbar_items[index];
+    const Extension* extension = toolbar_items[index].get();
     return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
   }
   return nil;
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm
index 9c46502..e3dbf83 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm
@@ -30,7 +30,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, BasicTest) {
 
   chrome::MockExtensionInstallPromptDelegate delegate;
   ExtensionInstallPrompt::Prompt prompt =
-      chrome::BuildExtensionInstallPrompt(extension_);
+      chrome::BuildExtensionInstallPrompt(extension_.get());
 
   ExtensionInstallDialogController* controller =
       new ExtensionInstallDialogController(show_params,
@@ -54,7 +54,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, Permissions) {
 
   chrome::MockExtensionInstallPromptDelegate delegate;
   ExtensionInstallPrompt::Prompt prompt =
-      chrome::BuildExtensionPostInstallPermissionsPrompt(extension_);
+      chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get());
 
   ExtensionInstallDialogController* controller =
       new ExtensionInstallDialogController(show_params,
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm
index a899064..51e4bee 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm
@@ -251,7 +251,7 @@ TEST_F(ExtensionInstallViewControllerTest, OAuthIssues) {
   chrome::MockExtensionInstallPromptDelegate delegate;
 
   ExtensionInstallPrompt::Prompt prompt =
-      chrome::BuildExtensionInstallPrompt(extension_);
+      chrome::BuildExtensionInstallPrompt(extension_.get());
   std::vector<string16> permissions;
   permissions.push_back(UTF8ToUTF16("warning 1"));
   prompt.SetPermissions(permissions);
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
index 4781dd6..4016bbd 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
@@ -111,7 +111,7 @@ class ExtensionInstalledBubbleControllerTest : public CocoaProfileTest {
     scoped_refptr<Extension> extension =
         Extension::Create(path, extensions::Manifest::INVALID_LOCATION,
                           extension_input_value, Extension::NO_FLAGS, &error);
-    extension_service_->AddExtension(extension);
+    extension_service_->AddExtension(extension.get());
     return extension;
   }
 
diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm
index c730c99..fc169c1 100644
--- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm
@@ -66,7 +66,7 @@ class FullscreenExitBubbleControllerTest : public CocoaProfileTest {
 
   void AppendTabToStrip() {
     WebContents* web_contents = WebContents::Create(
-        content::WebContents::CreateParams(profile(), site_instance_));
+        content::WebContents::CreateParams(profile(), site_instance_.get()));
     browser()->tab_strip_model()->AppendWebContents(
         web_contents, /*foreground=*/true);
   }
diff --git a/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm
index 7139ed6..7399ac5 100644
--- a/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm
@@ -87,8 +87,8 @@ class ActionBoxMenuBubbleControllerTest : public CocoaProfileTest {
                          .Set("background", extensions::DictionaryBuilder()
                              .Set("page", ""))))
         .Build();
-    service_->AddExtension(extension);
-    model->AddExtension(*extension, command_id);
+    service_->AddExtension(extension.get());
+    model->AddExtension(*extension.get(), command_id);
     return extension;
   }
 
diff --git a/chrome/browser/ui/cocoa/run_loop_testing.mm b/chrome/browser/ui/cocoa/run_loop_testing.mm
index 9918c90..f79aa53 100644
--- a/chrome/browser/ui/cocoa/run_loop_testing.mm
+++ b/chrome/browser/ui/cocoa/run_loop_testing.mm
@@ -43,7 +43,7 @@ void NSRunLoopRunAllPending() {
   // Put a delayed selector on the queue. All other pending delayed selectors
   // will run before this, after which the internal loop can end.
   base::scoped_nsobject<CocoaQuitTask> quit_task(
-      [[CocoaQuitTask alloc] initWithMessagePump:message_pump]);
+      [[CocoaQuitTask alloc] initWithMessagePump:message_pump.get()]);
 
   [quit_task performSelector:@selector(doQuit)
                   withObject:nil
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
index 232d55b..b3c9c05 100644
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
@@ -111,7 +111,7 @@ void ShowSSLClientCertificateSelector(
     CFIndex index =
         CFArrayGetFirstIndexOfValue(identities_, range, [panel_ identity]);
     if (index != -1)
-      cert = certificates_[index];
+      cert = certificates_[index].get();
     else
       NOTREACHED();
   }
diff --git a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm
index bace43e..fdeba6c 100644
--- a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm
@@ -25,7 +25,7 @@ class TabposeWindowTest : public CocoaProfileTest {
 
   void AppendTabToStrip() {
     content::WebContents* web_contents = content::WebContents::Create(
-        content::WebContents::CreateParams(profile(), site_instance_));
+        content::WebContents::CreateParams(profile(), site_instance_.get()));
     browser()->tab_strip_model()->AppendWebContents(
         web_contents, /*foreground=*/true);
   }
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 1fc0c83..b7f1c9d 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -1636,7 +1636,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {
                  projectorImage:projector
                      throbImage:projectorGlow
                      durationMS:kRecordingDurationMs
-             animationContainer:animationContainer_] autorelease];
+             animationContainer:animationContainer_.get()] autorelease];
 
           iconView = projectingView;
         } else if (theme && chrome::ShouldShowRecordingIndicator(contents)) {
@@ -1655,7 +1655,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {
                      throbImage:recording
                      durationMS:kRecordingDurationMs
                   throbPosition:kThrobPositionBottomRight
-             animationContainer:animationContainer_] autorelease];
+             animationContainer:animationContainer_.get()] autorelease];
 
           iconView = recordingView;
         } else if (chrome::IsPlayingAudio(contents) ||
@@ -1666,7 +1666,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) {
             tabAudioIndicatorViewMac = [[[TabAudioIndicatorViewMac alloc]
                 initWithFrame:frame] autorelease];
             [tabAudioIndicatorViewMac
-                setAnimationContainer:animationContainer_];
+                setAnimationContainer:animationContainer_.get()];
           }
           [tabAudioIndicatorViewMac
               setIsPlayingAudio:chrome::IsPlayingAudio(contents)];
diff --git a/cloud_print/gcp20/prototype/dns_sd_server.cc b/cloud_print/gcp20/prototype/dns_sd_server.cc
index 2d2716b..60c955e 100644
--- a/cloud_print/gcp20/prototype/dns_sd_server.cc
+++ b/cloud_print/gcp20/prototype/dns_sd_server.cc
@@ -241,10 +241,12 @@ void DnsSdServer::DoLoop(int rv) {
   // TODO(maksymb): Check what happened if buffer will be overflowed
   do {
     if (rv > 0)
-      ProcessMessage(rv, recv_buf_);
-    rv = socket_->RecvFrom(recv_buf_, recv_buf_->size(), &recv_address_,
-                           base::Bind(&DnsSdServer::DoLoop,
-                                      base::Unretained(this)));
+      ProcessMessage(rv, recv_buf_.get());
+    rv = socket_->RecvFrom(
+        recv_buf_.get(),
+        recv_buf_->size(),
+        &recv_address_,
+        base::Bind(&DnsSdServer::DoLoop, base::Unretained(this)));
   } while (rv > 0);
 
   // TODO(maksymb): Add handler for errors
diff --git a/content/browser/indexed_db/indexed_db_context_impl.cc b/content/browser/indexed_db/indexed_db_context_impl.cc
index 2156d35..6bfee75 100644
--- a/content/browser/indexed_db/indexed_db_context_impl.cc
+++ b/content/browser/indexed_db/indexed_db_context_impl.cc
@@ -108,13 +108,13 @@ IndexedDBContextImpl::IndexedDBContextImpl(
 
 IndexedDBFactory* IndexedDBContextImpl::GetIDBFactory() {
   DCHECK(TaskRunner()->RunsTasksOnCurrentThread());
-  if (!idb_factory_) {
+  if (!idb_factory_.get()) {
     // Prime our cache of origins with existing databases so we can
     // detect when dbs are newly created.
     GetOriginSet();
     idb_factory_ = IndexedDBFactory::Create();
   }
-  return idb_factory_;
+  return idb_factory_.get();
 }
 
 std::vector<GURL> IndexedDBContextImpl::GetAllOrigins() {
@@ -288,7 +288,7 @@ quota::QuotaManagerProxy* IndexedDBContextImpl::quota_manager_proxy() {
 }
 
 IndexedDBContextImpl::~IndexedDBContextImpl() {
-  if (idb_factory_) {
+  if (idb_factory_.get()) {
     IndexedDBFactory* factory = idb_factory_.get();
     factory->AddRef();
     idb_factory_ = NULL;
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 1a0d30a..1cf3238 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -981,11 +981,11 @@ void ResourceDispatcherHostImpl::BeginRequest(
   // Resolve elements from request_body and prepare upload data.
   if (request_data.request_body.get()) {
     request->set_upload(UploadDataStreamBuilder::Build(
-        request_data.request_body,
+        request_data.request_body.get(),
         filter_->blob_storage_context()->controller(),
         filter_->file_system_context(),
-        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE).
-            get()));
+        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)
+            .get()));
   }
 
   bool allow_download = request_data.allow_download &&
diff --git a/content/browser/loader/upload_data_stream_builder_unittest.cc b/content/browser/loader/upload_data_stream_builder_unittest.cc
index 8169160..2aa7bb8 100644
--- a/content/browser/loader/upload_data_stream_builder_unittest.cc
+++ b/content/browser/loader/upload_data_stream_builder_unittest.cc
@@ -71,9 +71,8 @@ TEST(UploadDataStreamBuilderTest, CreateUploadDataStreamWithoutBlob) {
                                 kFileOffset, kFileLength, kFileTime);
   request_body->set_identifier(kIdentifier);
 
-  scoped_ptr<net::UploadDataStream> upload(
-      UploadDataStreamBuilder::Build(
-          request_body, NULL, NULL, base::MessageLoopProxy::current().get()));
+  scoped_ptr<net::UploadDataStream> upload(UploadDataStreamBuilder::Build(
+      request_body.get(), NULL, NULL, base::MessageLoopProxy::current().get()));
 
   EXPECT_EQ(kIdentifier, upload->identifier());
   ASSERT_EQ(request_body->elements()->size(), upload->element_readers().size());
@@ -144,11 +143,10 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
                                 upload_element2.expected_modification_time());
 
   scoped_ptr<net::UploadDataStream> upload(
-      UploadDataStreamBuilder::Build(
-          request_body,
-          &blob_storage_controller,
-          NULL,
-          base::MessageLoopProxy::current().get()));
+      UploadDataStreamBuilder::Build(request_body.get(),
+                                     &blob_storage_controller,
+                                     NULL,
+                                     base::MessageLoopProxy::current().get()));
 
   ASSERT_EQ(2U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
@@ -158,22 +156,22 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
   request_body = new ResourceRequestBody();
   request_body->AppendBlob(blob_url0);
 
-  upload = UploadDataStreamBuilder::Build(
-      request_body,
-      &blob_storage_controller,
-      NULL,
-      base::MessageLoopProxy::current().get());
+  upload =
+      UploadDataStreamBuilder::Build(request_body.get(),
+                                     &blob_storage_controller,
+                                     NULL,
+                                     base::MessageLoopProxy::current().get());
   ASSERT_EQ(0U, upload->element_readers().size());
 
   // Test having only one blob reference.
   request_body = new ResourceRequestBody();
   request_body->AppendBlob(blob_url1);
 
-  upload = UploadDataStreamBuilder::Build(
-      request_body,
-      &blob_storage_controller,
-      NULL,
-      base::MessageLoopProxy::current().get());
+  upload =
+      UploadDataStreamBuilder::Build(request_body.get(),
+                                     &blob_storage_controller,
+                                     NULL,
+                                     base::MessageLoopProxy::current().get());
   ASSERT_EQ(2U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
@@ -187,11 +185,11 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
                                 upload_element2.length(),
                                 upload_element2.expected_modification_time());
 
-  upload = UploadDataStreamBuilder::Build(
-      request_body,
-      &blob_storage_controller,
-      NULL,
-      base::MessageLoopProxy::current().get());
+  upload =
+      UploadDataStreamBuilder::Build(request_body.get(),
+                                     &blob_storage_controller,
+                                     NULL,
+                                     base::MessageLoopProxy::current().get());
   ASSERT_EQ(4U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
@@ -207,11 +205,11 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
                                 upload_element2.expected_modification_time());
   request_body->AppendBlob(blob_url1);
 
-  upload = UploadDataStreamBuilder::Build(
-      request_body,
-      &blob_storage_controller,
-      NULL,
-      base::MessageLoopProxy::current().get());
+  upload =
+      UploadDataStreamBuilder::Build(request_body.get(),
+                                     &blob_storage_controller,
+                                     NULL,
+                                     base::MessageLoopProxy::current().get());
   ASSERT_EQ(4U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], upload_element2));
@@ -227,11 +225,11 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
                                 upload_element2.length(),
                                 upload_element2.expected_modification_time());
 
-  upload = UploadDataStreamBuilder::Build(
-      request_body,
-      &blob_storage_controller,
-      NULL,
-      base::MessageLoopProxy::current().get());
+  upload =
+      UploadDataStreamBuilder::Build(request_body.get(),
+                                     &blob_storage_controller,
+                                     NULL,
+                                     base::MessageLoopProxy::current().get());
   ASSERT_EQ(4U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], upload_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element1));
@@ -249,11 +247,11 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
                                 upload_element2.length(),
                                 upload_element2.expected_modification_time());
 
-  upload = UploadDataStreamBuilder::Build(
-      request_body,
-      &blob_storage_controller,
-      NULL,
-      base::MessageLoopProxy::current().get());
+  upload =
+      UploadDataStreamBuilder::Build(request_body.get(),
+                                     &blob_storage_controller,
+                                     NULL,
+                                     base::MessageLoopProxy::current().get());
   ASSERT_EQ(8U, upload->element_readers().size());
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[0], blob_element1));
   EXPECT_TRUE(AreElementsEqual(*upload->element_readers()[1], blob_element2));
diff --git a/content/browser/renderer_host/compositing_iosurface_layer_mac.mm b/content/browser/renderer_host/compositing_iosurface_layer_mac.mm
index a787de0..10b0727 100644
--- a/content/browser/renderer_host/compositing_iosurface_layer_mac.mm
+++ b/content/browser/renderer_host/compositing_iosurface_layer_mac.mm
@@ -35,7 +35,7 @@
 }
 
 - (BOOL)ensureContext {
-  if (context_)
+  if (context_.get())
     return YES;
 
   if (!renderWidgetHostView_)
@@ -46,12 +46,12 @@
     [context_->nsgl_context() clearDrawable];
   }
 
-  if (!context_) {
+  if (!context_.get()) {
     context_ = content::CompositingIOSurfaceContext::Get(
         renderWidgetHostView_->window_number());
   }
 
-  return context_ ? YES : NO;
+  return context_.get() ? YES : NO;
 }
 
 - (void)updateScaleFactor {
@@ -89,7 +89,7 @@
 }
 
 - (void)releaseCGLContext:(CGLContextObj)glContext {
-  if (!context_)
+  if (!context_.get())
     return;
 
   DCHECK(glContext == context_->cgl_context());
@@ -100,7 +100,7 @@
              pixelFormat:(CGLPixelFormatObj)pixelFormat
             forLayerTime:(CFTimeInterval)timeInterval
              displayTime:(const CVTimeStamp*)timeStamp {
-  if (!context_ || !renderWidgetHostView_ ||
+  if (!context_.get() || !renderWidgetHostView_ ||
       !renderWidgetHostView_->compositing_iosurface_) {
     glClearColor(1, 1, 1, 1);
     glClear(GL_COLOR_BUFFER_BIT);
diff --git a/content/browser/renderer_host/compositing_iosurface_mac.mm b/content/browser/renderer_host/compositing_iosurface_mac.mm
index b64152e..03e235e 100644
--- a/content/browser/renderer_host/compositing_iosurface_mac.mm
+++ b/content/browser/renderer_host/compositing_iosurface_mac.mm
@@ -124,7 +124,7 @@ bool MapBufferToVideoFrame(
   // letterboxing/pillarboxing).  Only do this once, since this is performed on
   // all planes in the VideoFrame here.
   if (plane == 0)
-    media::LetterboxYUV(target, region_in_frame);
+    media::LetterboxYUV(target.get(), region_in_frame);
 
   if (buf) {
     int packed_width = region_in_frame.width();
@@ -248,7 +248,7 @@ CompositingIOSurfaceMac* CompositingIOSurfaceMac::Create(int window_number) {
 
   scoped_refptr<CompositingIOSurfaceContext> context =
       CompositingIOSurfaceContext::Get(window_number);
-  if (!context) {
+  if (!context.get()) {
     LOG(ERROR) << "Failed to create context for IOSurface";
     return NULL;
   }
@@ -347,7 +347,7 @@ void CompositingIOSurfaceMac::SwitchToContextOnNewWindow(NSView* view,
 
   scoped_refptr<CompositingIOSurfaceContext> new_context =
       CompositingIOSurfaceContext::Get(window_number);
-  if (!new_context)
+  if (!new_context.get())
     return;
 
   // Having two NSOpenGLContexts bound to an NSView concurrently will cause
@@ -821,7 +821,7 @@ base::Closure CompositingIOSurfaceMac::CopyToSelectedOutputWithinContext(
     const SkBitmap* bitmap_output,
     const scoped_refptr<media::VideoFrame>& video_frame_output,
     const base::Callback<void(bool)>& done_callback) {
-  DCHECK_NE(bitmap_output != NULL, video_frame_output != NULL);
+  DCHECK_NE(bitmap_output != NULL, video_frame_output.get() != NULL);
   DCHECK(!done_callback.is_null());
 
   const bool async_copy = IsAsynchronousReadbackSupported();
@@ -1063,10 +1063,10 @@ bool CompositingIOSurfaceMac::SynchronousReadbackForCopy(
                  copy_context->output_texture_sizes[i].height(),
                  GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
                  buf); CHECK_AND_SAVE_GL_ERROR();
-    if (video_frame_output) {
+    if (video_frame_output.get()) {
       if (!temp_readback_buffer) {
         // Apply letterbox black-out around view region.
-        media::LetterboxYUV(video_frame_output, dst_pixel_rect);
+        media::LetterboxYUV(video_frame_output.get(), dst_pixel_rect);
       } else {
         // Copy from temporary buffer and fully render the VideoFrame.
         success &= MapBufferToVideoFrame(video_frame_output, dst_pixel_rect,
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 394f916..fcb719c 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -440,7 +440,7 @@ base::TaskRunner* RenderMessageFilter::OverrideTaskRunnerForMessage(
 #if defined(OS_MACOSX)
   // OSX CoreAudio calls must all happen on the main thread.
   if (message.type() == ViewHostMsg_GetAudioHardwareConfig::ID)
-    return audio_manager_->GetMessageLoop();
+    return audio_manager_->GetMessageLoop().get();
 #endif
   return NULL;
 }
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 7e86f054..4349775 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -492,7 +492,7 @@ void RenderWidgetHostViewMac::EnableCoreAnimation() {
 
 bool RenderWidgetHostViewMac::CreateCompositedIOSurfaceAndLayer() {
   if (compositing_iosurface_layer_ &&
-      [compositing_iosurface_layer_ context] &&
+      [compositing_iosurface_layer_ context].get() &&
       compositing_iosurface_) {
     return true;
   }
@@ -1103,7 +1103,7 @@ void RenderWidgetHostViewMac::CopyFromCompositingSurfaceToVideoFrame(
       !compositing_iosurface_->HasIOSurface())
     return;
 
-  if (!target) {
+  if (!target.get()) {
     NOTREACHED();
     return;
   }
diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm
index c940c80..0c20d22 100644
--- a/content/browser/web_contents/web_drag_source_mac.mm
+++ b/content/browser/web_contents/web_drag_source_mac.mm
@@ -388,7 +388,8 @@ NSString* GetDropLocation(NSPasteboard* pboard) {
         contents_));
 
     // The finalizer will take care of closing and deletion.
-    dragFileDownloader->Start(new PromiseFileFinalizer(dragFileDownloader));
+    dragFileDownloader->Start(new PromiseFileFinalizer(
+        dragFileDownloader.get()));
   } else {
     // The writer will take care of closing and deletion.
     BrowserThread::PostTask(BrowserThread::FILE,
diff --git a/content/child/indexed_db/indexed_db_dispatcher.cc b/content/child/indexed_db/indexed_db_dispatcher.cc
index b6e57ea..48391f4 100644
--- a/content/child/indexed_db/indexed_db_dispatcher.cc
+++ b/content/child/indexed_db/indexed_db_dispatcher.cc
@@ -460,7 +460,7 @@ void IndexedDBDispatcher::OnSuccessIDBDatabase(
   // If an upgrade was performed, count will be non-zero.
   if (!databases_.count(ipc_object_id))
     databases_[ipc_object_id] = new RendererWebIDBDatabaseImpl(
-        ipc_object_id, ipc_database_callbacks_id, thread_safe_sender_);
+        ipc_object_id, ipc_database_callbacks_id, thread_safe_sender_.get());
   DCHECK_EQ(databases_.count(ipc_object_id), 1u);
   callbacks->onSuccess(databases_[ipc_object_id], metadata);
   pending_callbacks_.Remove(ipc_callbacks_id);
@@ -557,7 +557,7 @@ void IndexedDBDispatcher::OnSuccessOpenCursor(
     return;
 
   RendererWebIDBCursorImpl* cursor =
-      new RendererWebIDBCursorImpl(ipc_object_id, thread_safe_sender_);
+      new RendererWebIDBCursorImpl(ipc_object_id, thread_safe_sender_.get());
   cursors_[ipc_object_id] = cursor;
   callbacks->onSuccess(cursor, key, primary_key, web_value);
 
@@ -626,8 +626,10 @@ void IndexedDBDispatcher::OnUpgradeNeeded(
   DCHECK(callbacks);
   WebIDBMetadata metadata(ConvertMetadata(p.idb_metadata));
   DCHECK(!databases_.count(p.ipc_database_id));
-  databases_[p.ipc_database_id] = new RendererWebIDBDatabaseImpl(
-      p.ipc_database_id, p.ipc_database_callbacks_id, thread_safe_sender_);
+  databases_[p.ipc_database_id] =
+      new RendererWebIDBDatabaseImpl(p.ipc_database_id,
+                                     p.ipc_database_callbacks_id,
+                                     thread_safe_sender_.get());
   callbacks->onUpgradeNeeded(
       p.old_version,
       databases_[p.ipc_database_id],
diff --git a/content/child/indexed_db/indexed_db_dispatcher_unittest.cc b/content/child/indexed_db/indexed_db_dispatcher_unittest.cc
index 3702657..497da4a 100644
--- a/content/child/indexed_db/indexed_db_dispatcher_unittest.cc
+++ b/content/child/indexed_db/indexed_db_dispatcher_unittest.cc
@@ -51,10 +51,10 @@ TEST(IndexedDBDispatcherTest, ValueSizeTest) {
   scoped_refptr<IPC::SyncMessageFilter> sync_message_filter(
       new IPC::SyncMessageFilter(NULL));
   scoped_refptr<ThreadSafeSender> thread_safe_sender(new ThreadSafeSender(
-      message_loop_proxy, sync_message_filter));
+      message_loop_proxy.get(), sync_message_filter.get()));
 
   MockCallbacks callbacks;
-  IndexedDBDispatcher dispatcher(thread_safe_sender);
+  IndexedDBDispatcher dispatcher(thread_safe_sender.get());
   IndexedDBKey key(0, WebIDBKey::NumberType);
   dispatcher.RequestIDBDatabasePut(ipc_dummy_id,
                                    transaction_id,
diff --git a/content/child/indexed_db/indexed_db_message_filter.cc b/content/child/indexed_db/indexed_db_message_filter.cc
index 68796c4..7022925 100644
--- a/content/child/indexed_db/indexed_db_message_filter.cc
+++ b/content/child/indexed_db/indexed_db_message_filter.cc
@@ -46,8 +46,8 @@ bool IndexedDBMessageFilter::OnMessageReceived(const IPC::Message& msg) {
 IndexedDBMessageFilter::~IndexedDBMessageFilter() {}
 
 void IndexedDBMessageFilter::DispatchMessage(const IPC::Message& msg) {
-  IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_)->
-      OnMessageReceived(msg);
+  IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get())
+      ->OnMessageReceived(msg);
 }
 
 void IndexedDBMessageFilter::OnStaleMessageReceived(const IPC::Message& msg) {
diff --git a/content/child/indexed_db/proxy_webidbcursor_impl.cc b/content/child/indexed_db/proxy_webidbcursor_impl.cc
index 4062fd0..ed1b536 100644
--- a/content/child/indexed_db/proxy_webidbcursor_impl.cc
+++ b/content/child/indexed_db/proxy_webidbcursor_impl.cc
@@ -38,14 +38,14 @@ RendererWebIDBCursorImpl::~RendererWebIDBCursorImpl() {
         new IndexedDBHostMsg_CursorDestroyed(ipc_cursor_id_));
   }
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->CursorDestroyed(ipc_cursor_id_);
 }
 
 void RendererWebIDBCursorImpl::advance(unsigned long count,
                                        WebIDBCallbacks* callbacks_ptr) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
   ResetPrefetchCache();
   dispatcher->RequestIDBCursorAdvance(
@@ -56,7 +56,7 @@ void RendererWebIDBCursorImpl::continueFunction(
     const WebIDBKey& key,
     WebIDBCallbacks* callbacks_ptr) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   if (key.type() == WebIDBKey::NullType) {
@@ -147,7 +147,7 @@ void RendererWebIDBCursorImpl::ResetPrefetchCache() {
   }
 
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->RequestIDBCursorPrefetchReset(
       used_prefetches_, prefetch_keys_.size(), ipc_cursor_id_);
   prefetch_keys_.clear();
diff --git a/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc b/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc
index 5c0e586..2dcc619 100644
--- a/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc
+++ b/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc
@@ -91,13 +91,13 @@ TEST(RendererWebIDBCursorImplTest, PrefetchTest) {
   scoped_refptr<IPC::SyncMessageFilter> sync_message_filter(
       new IPC::SyncMessageFilter(NULL));
   scoped_refptr<ThreadSafeSender> thread_safe_sender(new ThreadSafeSender(
-      message_loop_proxy, sync_message_filter));
+      message_loop_proxy.get(), sync_message_filter.get()));
 
-  MockDispatcher dispatcher(thread_safe_sender);
+  MockDispatcher dispatcher(thread_safe_sender.get());
 
   {
-    RendererWebIDBCursorImpl cursor(
-        RendererWebIDBCursorImpl::kInvalidCursorId, thread_safe_sender);
+    RendererWebIDBCursorImpl cursor(RendererWebIDBCursorImpl::kInvalidCursorId,
+                                    thread_safe_sender.get());
 
     // Call continue() until prefetching should kick in.
     int continue_calls = 0;
diff --git a/content/child/indexed_db/proxy_webidbdatabase_impl.cc b/content/child/indexed_db/proxy_webidbdatabase_impl.cc
index a552b03..2fd15ee 100644
--- a/content/child/indexed_db/proxy_webidbdatabase_impl.cc
+++ b/content/child/indexed_db/proxy_webidbdatabase_impl.cc
@@ -42,7 +42,7 @@ RendererWebIDBDatabaseImpl::~RendererWebIDBDatabaseImpl() {
   thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseDestroyed(
       ipc_database_id_));
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->DatabaseDestroyed(ipc_database_id_);
 }
 
@@ -81,17 +81,14 @@ void RendererWebIDBDatabaseImpl::createTransaction(
     unsigned short mode)
 {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabaseCreateTransaction(ipc_database_id_,
-                                                  transaction_id,
-                                                  callbacks,
-                                                  object_store_ids,
-                                                  mode);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabaseCreateTransaction(
+      ipc_database_id_, transaction_id, callbacks, object_store_ids, mode);
 }
 
 void RendererWebIDBDatabaseImpl::close() {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->RequestIDBDatabaseClose(ipc_database_id_,
                                       ipc_database_callbacks_id_);
 }
@@ -104,10 +101,14 @@ void RendererWebIDBDatabaseImpl::get(
     bool key_only,
     WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabaseGet(
-      ipc_database_id_, transaction_id, object_store_id, index_id,
-      IndexedDBKeyRange(key_range), key_only, callbacks);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabaseGet(ipc_database_id_,
+                                    transaction_id,
+                                    object_store_id,
+                                    index_id,
+                                    IndexedDBKeyRange(key_range),
+                                    key_only,
+                                    callbacks);
 }
 
 void RendererWebIDBDatabaseImpl::put(
@@ -120,11 +121,16 @@ void RendererWebIDBDatabaseImpl::put(
     const WebVector<long long>& web_index_ids,
     const WebVector<WebIndexKeys>& web_index_keys) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabasePut(
-      ipc_database_id_, transaction_id, object_store_id,
-      value, IndexedDBKey(key), put_mode, callbacks,
-      web_index_ids, web_index_keys);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabasePut(ipc_database_id_,
+                                    transaction_id,
+                                    object_store_id,
+                                    value,
+                                    IndexedDBKey(key),
+                                    put_mode,
+                                    callbacks,
+                                    web_index_ids,
+                                    web_index_keys);
 }
 
 void RendererWebIDBDatabaseImpl::setIndexKeys(
@@ -174,11 +180,16 @@ void RendererWebIDBDatabaseImpl::openCursor(
     TaskType task_type,
     WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabaseOpenCursor(
-      ipc_database_id_,
-      transaction_id, object_store_id, index_id,
-      IndexedDBKeyRange(key_range), direction, key_only, task_type, callbacks);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabaseOpenCursor(ipc_database_id_,
+                                           transaction_id,
+                                           object_store_id,
+                                           index_id,
+                                           IndexedDBKeyRange(key_range),
+                                           direction,
+                                           key_only,
+                                           task_type,
+                                           callbacks);
 }
 
 void RendererWebIDBDatabaseImpl::count(
@@ -188,11 +199,13 @@ void RendererWebIDBDatabaseImpl::count(
     const WebKit::WebIDBKeyRange& key_range,
     WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabaseCount(
-      ipc_database_id_,
-      transaction_id, object_store_id, index_id,
-      IndexedDBKeyRange(key_range), callbacks);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabaseCount(ipc_database_id_,
+                                      transaction_id,
+                                      object_store_id,
+                                      index_id,
+                                      IndexedDBKeyRange(key_range),
+                                      callbacks);
 }
 
 void RendererWebIDBDatabaseImpl::deleteRange(
@@ -201,11 +214,12 @@ void RendererWebIDBDatabaseImpl::deleteRange(
     const WebKit::WebIDBKeyRange& key_range,
     WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBDatabaseDeleteRange(
-      ipc_database_id_,
-      transaction_id, object_store_id,
-      IndexedDBKeyRange(key_range), callbacks);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBDatabaseDeleteRange(ipc_database_id_,
+                                            transaction_id,
+                                            object_store_id,
+                                            IndexedDBKeyRange(key_range),
+                                            callbacks);
 }
 
 void RendererWebIDBDatabaseImpl::clear(
@@ -213,10 +227,9 @@ void RendererWebIDBDatabaseImpl::clear(
     long long object_store_id,
     WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->RequestIDBDatabaseClear(
-      ipc_database_id_,
-      transaction_id, object_store_id, callbacks);
+      ipc_database_id_, transaction_id, object_store_id, callbacks);
 }
 
 void RendererWebIDBDatabaseImpl::createIndex(
diff --git a/content/child/indexed_db/proxy_webidbfactory_impl.cc b/content/child/indexed_db/proxy_webidbfactory_impl.cc
index 236a156..1e3d861 100644
--- a/content/child/indexed_db/proxy_webidbfactory_impl.cc
+++ b/content/child/indexed_db/proxy_webidbfactory_impl.cc
@@ -28,9 +28,9 @@ void RendererWebIDBFactoryImpl::getDatabaseNames(
     WebIDBCallbacks* callbacks,
     const WebString& database_identifier) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBFactoryGetDatabaseNames(
-      callbacks, database_identifier.utf8());
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBFactoryGetDatabaseNames(callbacks,
+                                                database_identifier.utf8());
 }
 
 void RendererWebIDBFactoryImpl::open(
@@ -41,10 +41,13 @@ void RendererWebIDBFactoryImpl::open(
     WebIDBDatabaseCallbacks* database_callbacks,
     const WebString& database_identifier) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
-  dispatcher->RequestIDBFactoryOpen(
-      name, version, transaction_id, callbacks, database_callbacks,
-      database_identifier.utf8());
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
+  dispatcher->RequestIDBFactoryOpen(name,
+                                    version,
+                                    transaction_id,
+                                    callbacks,
+                                    database_callbacks,
+                                    database_identifier.utf8());
 }
 
 void RendererWebIDBFactoryImpl::deleteDatabase(
@@ -52,7 +55,7 @@ void RendererWebIDBFactoryImpl::deleteDatabase(
     WebIDBCallbacks* callbacks,
     const WebString& database_identifier) {
   IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_);
+      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->RequestIDBFactoryDeleteDatabase(
       name, callbacks, database_identifier.utf8());
 }
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 594e196..4c6e897 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -386,7 +386,8 @@ RendererWebKitPlatformSupportImpl::createLocalStorageNamespace() {
 
 WebIDBFactory* RendererWebKitPlatformSupportImpl::idbFactory() {
   if (!web_idb_factory_)
-    web_idb_factory_.reset(new RendererWebIDBFactoryImpl(thread_safe_sender_));
+    web_idb_factory_.reset(
+        new RendererWebIDBFactoryImpl(thread_safe_sender_.get()));
   return web_idb_factory_.get();
 }
 
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index c2b7179..d290fe5 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -204,7 +204,8 @@ long long WorkerWebKitPlatformSupportImpl::databaseGetSpaceAvailableForOrigin(
 
 WebKit::WebIDBFactory* WorkerWebKitPlatformSupportImpl::idbFactory() {
   if (!web_idb_factory_)
-    web_idb_factory_.reset(new RendererWebIDBFactoryImpl(thread_safe_sender_));
+    web_idb_factory_.reset(
+        new RendererWebIDBFactoryImpl(thread_safe_sender_.get()));
   return web_idb_factory_.get();
 }
 
diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc
index 9f70073..0d20746 100644
--- a/net/cert/cert_verify_proc_unittest.cc
+++ b/net/cert/cert_verify_proc_unittest.cc
@@ -902,7 +902,7 @@ TEST_F(CertVerifyProcTest, CybertrustGTERoot) {
                          "cybertrust_baltimore_root.pem");
   ASSERT_TRUE(baltimore_root.get());
 
-  ScopedTestRoot scoped_root(baltimore_root);
+  ScopedTestRoot scoped_root(baltimore_root.get());
 
   // Ensure that ONLY the Baltimore CyberTrust Root is trusted. This
   // simulates Keychain removing support for the GTE CyberTrust Root.
@@ -917,8 +917,12 @@ TEST_F(CertVerifyProcTest, CybertrustGTERoot) {
   // works. Only the first two certificates are included in the chain.
   int flags = 0;
   CertVerifyResult verify_result;
-  int error = Verify(cybertrust_basic, "cacert.omniroot.com", flags, NULL,
-                     empty_cert_list_, &verify_result);
+  int error = Verify(cybertrust_basic.get(),
+                     "cacert.omniroot.com",
+                     flags,
+                     NULL,
+                     empty_cert_list_,
+                     &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 
@@ -936,8 +940,12 @@ TEST_F(CertVerifyProcTest, CybertrustGTERoot) {
   scoped_refptr<X509Certificate> baltimore_chain_1 =
       X509Certificate::CreateFromHandle(cybertrust_basic->os_cert_handle(),
                                         intermediate_chain_1);
-  error = Verify(baltimore_chain_1, "cacert.omniroot.com", flags, NULL,
-                 empty_cert_list_, &verify_result);
+  error = Verify(baltimore_chain_1.get(),
+                 "cacert.omniroot.com",
+                 flags,
+                 NULL,
+                 empty_cert_list_,
+                 &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 
@@ -955,8 +963,12 @@ TEST_F(CertVerifyProcTest, CybertrustGTERoot) {
   scoped_refptr<X509Certificate> baltimore_chain_2 =
       X509Certificate::CreateFromHandle(cybertrust_basic->os_cert_handle(),
                                         intermediate_chain_2);
-  error = Verify(baltimore_chain_2, "cacert.omniroot.com", flags, NULL,
-                 empty_cert_list_, &verify_result);
+  error = Verify(baltimore_chain_2.get(),
+                 "cacert.omniroot.com",
+                 flags,
+                 NULL,
+                 empty_cert_list_,
+                 &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 
@@ -971,8 +983,12 @@ TEST_F(CertVerifyProcTest, CybertrustGTERoot) {
   scoped_refptr<X509Certificate> baltimore_chain_with_root =
       X509Certificate::CreateFromHandle(cybertrust_basic->os_cert_handle(),
                                         intermediate_chain_2);
-  error = Verify(baltimore_chain_with_root, "cacert.omniroot.com", flags,
-                 NULL, empty_cert_list_, &verify_result);
+  error = Verify(baltimore_chain_with_root.get(),
+                 "cacert.omniroot.com",
+                 flags,
+                 NULL,
+                 empty_cert_list_,
+                 &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 
diff --git a/net/cert/x509_certificate.cc b/net/cert/x509_certificate.cc
index 5a3b18d..b6f9cd6 100644
--- a/net/cert/x509_certificate.cc
+++ b/net/cert/x509_certificate.cc
@@ -221,7 +221,7 @@ void SplitOnChar(const base::StringPiece& src,
 bool X509Certificate::LessThan::operator()(
     const scoped_refptr<X509Certificate>& lhs,
     const scoped_refptr<X509Certificate>& rhs) const {
-  if (lhs == rhs)
+  if (lhs.get() == rhs.get())
     return false;
 
   int rv = memcmp(lhs->fingerprint_.data, rhs->fingerprint_.data,
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index 21a46fd..1e5f231 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -336,7 +336,7 @@ int SyncClientMain(int argc, char* argv[]) {
   // TODO(akalin): Replace this with just the context getter once
   // HttpPostProviderFactory is removed.
   scoped_ptr<HttpPostProviderFactory> post_factory(
-      new HttpBridgeFactory(context_getter,
+      new HttpBridgeFactory(context_getter.get(),
                             kUserAgent,
                             base::Bind(&StubNetworkTimeUpdateCallback)));
   // Used only when committing bookmarks, so it's okay to leave this