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

Linux fixes, Part 4 of N

BUG=110610
TBR=darin

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

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

117 files changed, 619 insertions, 567 deletions

diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
index 0649e9e..29cdf3f 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -612,8 +612,12 @@ void ChromeRenderMessageFilter::OnExtensionRequestForIOThread(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   ExtensionFunctionDispatcher::DispatchOnIOThread(
-      extension_info_map_, profile_, render_process_id_,
-      weak_ptr_factory_.GetWeakPtr(), routing_id, params);
+      extension_info_map_.get(),
+      profile_,
+      render_process_id_,
+      weak_ptr_factory_.GetWeakPtr(),
+      routing_id,
+      params);
 }
 
 void ChromeRenderMessageFilter::OnExtensionShouldSuspendAck(
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index e1371ac..fcef97b 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -284,9 +284,12 @@ void ChromeResourceDispatcherHostDelegate::DownloadStarting(
 
   // If it's from the web, we don't trust it, so we push the throttle on.
   if (is_content_initiated) {
-    throttles->push_back(new DownloadResourceThrottle(
-        download_request_limiter_, child_id, route_id, request_id,
-        request->method()));
+    throttles->push_back(
+        new DownloadResourceThrottle(download_request_limiter_.get(),
+                                     child_id,
+                                     route_id,
+                                     request_id,
+                                     request->method()));
 #if defined(OS_ANDROID)
     throttles->push_back(
         new chrome::InterceptDownloadResourceThrottle(
@@ -390,8 +393,11 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
   if (io_data->safe_browsing_enabled()->GetValue()) {
     bool is_subresource_request = resource_type != ResourceType::MAIN_FRAME;
     content::ResourceThrottle* throttle =
-        SafeBrowsingResourceThrottleFactory::Create(request, child_id, route_id,
-            is_subresource_request, safe_browsing_);
+        SafeBrowsingResourceThrottleFactory::Create(request,
+                                                    child_id,
+                                                    route_id,
+                                                    is_subresource_request,
+                                                    safe_browsing_.get());
     if (throttle)
       throttles->push_back(throttle);
   }
diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc
index 2f33534..cc8dc94 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host.cc
@@ -80,7 +80,7 @@ class ClientSideDetectionHost::ShouldClassifyUrlRequest
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(web_contents_);
     DCHECK(csd_service_);
-    DCHECK(database_manager_);
+    DCHECK(database_manager_.get());
     DCHECK(host_);
   }
 
@@ -166,7 +166,7 @@ class ClientSideDetectionHost::ShouldClassifyUrlRequest
 
   void CheckCsdWhitelist(const GURL& url) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    if (!database_manager_ ||
+    if (!database_manager_.get() ||
         database_manager_->MatchCsdWhitelistUrl(url)) {
       // We're done.  There is no point in going back to the UI thread.
       VLOG(1) << "Skipping phishing classification for URL: " << url
@@ -264,7 +264,7 @@ ClientSideDetectionHost::ClientSideDetectionHost(WebContents* tab)
 
   scoped_refptr<SafeBrowsingService> sb_service =
       g_browser_process->safe_browsing_service();
-  if (sb_service) {
+  if (sb_service.get()) {
     ui_manager_ = sb_service->ui_manager();
     database_manager_ = sb_service->database_manager();
     ui_manager_->AddObserver(this);
@@ -279,7 +279,7 @@ ClientSideDetectionHost::ClientSideDetectionHost(WebContents* tab)
 }
 
 ClientSideDetectionHost::~ClientSideDetectionHost() {
-  if (ui_manager_)
+  if (ui_manager_.get())
     ui_manager_->RemoveObserver(this);
 }
 
@@ -332,11 +332,8 @@ void ClientSideDetectionHost::DidNavigateMainFrame(
   browse_info_->http_status_code = details.http_status_code;
 
   // Notify the renderer if it should classify this URL.
-  classification_request_ = new ShouldClassifyUrlRequest(params,
-                                                         web_contents(),
-                                                         csd_service_,
-                                                         database_manager_,
-                                                         this);
+  classification_request_ = new ShouldClassifyUrlRequest(
+      params, web_contents(), csd_service_, database_manager_.get(), this);
   classification_request_->Start();
 }
 
@@ -432,7 +429,7 @@ void ClientSideDetectionHost::MaybeShowPhishingWarning(GURL phishing_url,
           << " is_phishing:" << is_phishing;
   if (is_phishing) {
     DCHECK(web_contents());
-    if (ui_manager_) {
+    if (ui_manager_.get()) {
       SafeBrowsingUIManager::UnsafeResource resource;
       resource.url = phishing_url;
       resource.original_url = phishing_url;
@@ -542,7 +539,7 @@ void ClientSideDetectionHost::set_client_side_detection_service(
 void ClientSideDetectionHost::set_safe_browsing_managers(
     SafeBrowsingUIManager* ui_manager,
     SafeBrowsingDatabaseManager* database_manager) {
-  if (ui_manager_)
+  if (ui_manager_.get())
     ui_manager_->RemoveObserver(this);
 
   ui_manager_ = ui_manager;
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index 3447553..57ad568 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -215,7 +215,8 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
     csd_host_.reset(safe_browsing::ClientSideDetectionHost::Create(
         web_contents()));
     csd_host_->set_client_side_detection_service(csd_service_.get());
-    csd_host_->set_safe_browsing_managers(ui_manager_, database_manager_);
+    csd_host_->set_safe_browsing_managers(ui_manager_.get(),
+                                          database_manager_.get());
     // We need to create this here since we don't call
     // DidNavigateMainFramePostCommit in this test.
     csd_host_->browse_info_.reset(new BrowseInfo);
@@ -289,7 +290,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
           .WillRepeatedly(Return(*is_incognito));
     }
     if (match_csd_whitelist) {
-      EXPECT_CALL(*database_manager_, MatchCsdWhitelistUrl(url))
+      EXPECT_CALL(*database_manager_.get(), MatchCsdWhitelistUrl(url))
           .WillOnce(Return(*match_csd_whitelist));
     }
     if (get_valid_cached_result) {
@@ -405,7 +406,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneNotPhishing) {
   ASSERT_FALSE(cb.is_null());
 
   // Make sure DoDisplayBlockingPage is not going to be called.
-  EXPECT_CALL(*ui_manager_, DoDisplayBlockingPage(_)).Times(0);
+  EXPECT_CALL(*ui_manager_.get(), DoDisplayBlockingPage(_)).Times(0);
   cb.Run(GURL(verdict.url()), false);
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(Mock::VerifyAndClear(ui_manager_.get()));
@@ -437,7 +438,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneDisabled) {
   ASSERT_FALSE(cb.is_null());
 
   // Make sure DoDisplayBlockingPage is not going to be called.
-  EXPECT_CALL(*ui_manager_, DoDisplayBlockingPage(_)).Times(0);
+  EXPECT_CALL(*ui_manager_.get(), DoDisplayBlockingPage(_)).Times(0);
   cb.Run(GURL(verdict.url()), false);
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(Mock::VerifyAndClear(ui_manager_.get()));
@@ -470,7 +471,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneShowInterstitial) {
   ASSERT_FALSE(cb.is_null());
 
   UnsafeResource resource;
-  EXPECT_CALL(*ui_manager_, DoDisplayBlockingPage(_))
+  EXPECT_CALL(*ui_manager_.get(), DoDisplayBlockingPage(_))
       .WillOnce(SaveArg<0>(&resource));
   cb.Run(phishing_url, true);
 
@@ -559,7 +560,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneMultiplePings) {
   // We expect that the interstitial is shown for the second phishing URL and
   // not for the first phishing URL.
   UnsafeResource resource;
-  EXPECT_CALL(*ui_manager_, DoDisplayBlockingPage(_))
+  EXPECT_CALL(*ui_manager_.get(), DoDisplayBlockingPage(_))
       .WillOnce(SaveArg<0>(&resource));
 
   cb.Run(phishing_url, true);  // Should have no effect.
@@ -951,7 +952,7 @@ TEST_F(ClientSideDetectionHostTest, ShouldClassifyUrl) {
                                 NULL);
 
   UnsafeResource resource;
-  EXPECT_CALL(*ui_manager_, DoDisplayBlockingPage(_))
+  EXPECT_CALL(*ui_manager_.get(), DoDisplayBlockingPage(_))
       .WillOnce(SaveArg<0>(&resource));
 
   NavigateAndCommit(url);
diff --git a/chrome/browser/safe_browsing/database_manager.cc b/chrome/browser/safe_browsing/database_manager.cc
index 9da9779..b1800e6 100644
--- a/chrome/browser/safe_browsing/database_manager.cc
+++ b/chrome/browser/safe_browsing/database_manager.cc
@@ -145,7 +145,7 @@ SafeBrowsingDatabaseManager::SafeBrowsingDatabaseManager(
       database_update_in_progress_(false),
       closing_database_(false),
       check_timeout_(base::TimeDelta::FromMilliseconds(kCheckTimeoutMs)) {
-  DCHECK(sb_service_ != NULL);
+  DCHECK(sb_service_.get() != NULL);
 
   CommandLine* cmdline = CommandLine::ForCurrentProcess();
   enable_download_protection_ =
diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc
index 5645c25..2700f57 100644
--- a/chrome/browser/safe_browsing/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection_service.cc
@@ -237,8 +237,8 @@ class DownloadUrlSBClient : public DownloadSBClient {
 
   virtual void StartCheck() OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    if (!database_manager_ || database_manager_->CheckDownloadUrl(
-           url_chain_, this)) {
+    if (!database_manager_.get() ||
+        database_manager_->CheckDownloadUrl(url_chain_, this)) {
       CheckDone(SB_THREAT_TYPE_SAFE);
     } else {
       AddRef();  // SafeBrowsingService takes a pointer not a scoped_refptr.
@@ -551,7 +551,7 @@ class DownloadProtectionService::CheckClientDownloadRequest
   void CheckWhitelists() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     DownloadCheckResultReason reason = REASON_MAX;
-    if (!database_manager_) {
+    if (!database_manager_.get()) {
       reason = REASON_SB_DISABLED;
     } else {
       for (size_t i = 0; i < url_chain_.size(); ++i) {
@@ -719,7 +719,7 @@ class DownloadProtectionService::CheckClientDownloadRequest
       }
       std::vector<std::string> whitelist_strings;
       DownloadProtectionService::GetCertificateWhitelistStrings(
-          *cert, *issuer, &whitelist_strings);
+          *cert.get(), *issuer.get(), &whitelist_strings);
       for (size_t j = 0; j < whitelist_strings.size(); ++j) {
         if (database_manager_->MatchDownloadWhitelistString(
                 whitelist_strings[j])) {
diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc
index c497c2b..e693429 100644
--- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc
+++ b/chrome/browser/safe_browsing/download_protection_service_unittest.cc
@@ -373,7 +373,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadWhitelistedUrl) {
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               MatchDownloadWhitelistUrl(GURL("http://www.google.com/a.exe")))
       .WillRepeatedly(Return(true));
-  EXPECT_CALL(*signature_util_, CheckSignature(a_tmp, _)).Times(2);
+  EXPECT_CALL(*signature_util_.get(), CheckSignature(a_tmp, _)).Times(2);
 
   download_service_->CheckClientDownload(
       &item,
@@ -421,7 +421,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadFetchFailed) {
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               MatchDownloadWhitelistUrl(_))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*signature_util_, CheckSignature(a_tmp, _));
+  EXPECT_CALL(*signature_util_.get(), CheckSignature(a_tmp, _));
 
   download_service_->CheckClientDownload(
       &item,
@@ -463,7 +463,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadSuccess) {
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               MatchDownloadWhitelistUrl(_))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*signature_util_, CheckSignature(a_tmp, _)).Times(5);
+  EXPECT_CALL(*signature_util_.get(), CheckSignature(a_tmp, _)).Times(5);
 
   download_service_->CheckClientDownload(
       &item,
@@ -573,7 +573,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadHTTPS) {
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               MatchDownloadWhitelistUrl(_))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*signature_util_, CheckSignature(a_tmp, _)).Times(1);
+  EXPECT_CALL(*signature_util_.get(), CheckSignature(a_tmp, _)).Times(1);
 
   download_service_->CheckClientDownload(
       &item,
@@ -635,8 +635,8 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadZip) {
                  base::Unretained(this)));
   msg_loop_.Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
-  Mock::VerifyAndClearExpectations(sb_service_);
-  Mock::VerifyAndClearExpectations(signature_util_);
+  Mock::VerifyAndClearExpectations(sb_service_.get());
+  Mock::VerifyAndClearExpectations(signature_util_.get());
 
   // Now check with an executable in the zip file as well.
   ASSERT_EQ(static_cast<int>(file_contents.size()), file_util::WriteFile(
@@ -654,7 +654,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadZip) {
                  base::Unretained(this)));
   msg_loop_.Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
-  Mock::VerifyAndClearExpectations(signature_util_);
+  Mock::VerifyAndClearExpectations(signature_util_.get());
 
   // If the response is dangerous the result should also be marked as
   // dangerous.
@@ -674,7 +674,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadZip) {
 #else
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
 #endif
-  Mock::VerifyAndClearExpectations(signature_util_);
+  Mock::VerifyAndClearExpectations(signature_util_.get());
 }
 
 TEST_F(DownloadProtectionServiceTest, CheckClientDownloadCorruptZip) {
@@ -710,8 +710,8 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadCorruptZip) {
                  base::Unretained(this)));
   msg_loop_.Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
-  Mock::VerifyAndClearExpectations(sb_service_);
-  Mock::VerifyAndClearExpectations(signature_util_);
+  Mock::VerifyAndClearExpectations(sb_service_.get());
+  Mock::VerifyAndClearExpectations(signature_util_.get());
 }
 
 TEST_F(DownloadProtectionServiceTest, CheckClientCrxDownloadSuccess) {
@@ -749,7 +749,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientCrxDownloadSuccess) {
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               MatchDownloadWhitelistUrl(_))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*signature_util_, CheckSignature(a_tmp, _)).Times(1);
+  EXPECT_CALL(*signature_util_.get(), CheckSignature(a_tmp, _)).Times(1);
 
   EXPECT_FALSE(download_service_->IsSupportedDownload(item, a_crx));
   download_service_->CheckClientDownload(
@@ -787,7 +787,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadValidateRequest) {
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               MatchDownloadWhitelistUrl(_))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*signature_util_, CheckSignature(tmp_path, _))
+  EXPECT_CALL(*signature_util_.get(), CheckSignature(tmp_path, _))
       .WillOnce(SetCertificateContents("dummy cert data"));
   download_service_->CheckClientDownload(
       &item,
@@ -864,7 +864,7 @@ TEST_F(DownloadProtectionServiceTest,
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               MatchDownloadWhitelistUrl(_))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*signature_util_, CheckSignature(tmp_path, _));
+  EXPECT_CALL(*signature_util_.get(), CheckSignature(tmp_path, _));
   download_service_->CheckClientDownload(
       &item,
       base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
@@ -930,7 +930,7 @@ TEST_F(DownloadProtectionServiceTest, TestCheckDownloadUrl) {
                  base::Unretained(this)));
   msg_loop_.Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
-  Mock::VerifyAndClearExpectations(sb_service_);
+  Mock::VerifyAndClearExpectations(sb_service_.get());
 
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               CheckDownloadUrl(ContainerEq(url_chain), NotNull()))
@@ -942,7 +942,7 @@ TEST_F(DownloadProtectionServiceTest, TestCheckDownloadUrl) {
                  base::Unretained(this)));
   msg_loop_.Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
-  Mock::VerifyAndClearExpectations(sb_service_);
+  Mock::VerifyAndClearExpectations(sb_service_.get());
 
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               CheckDownloadUrl(ContainerEq(url_chain), NotNull()))
@@ -955,7 +955,7 @@ TEST_F(DownloadProtectionServiceTest, TestCheckDownloadUrl) {
                  base::Unretained(this)));
   msg_loop_.Run();
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
-  Mock::VerifyAndClearExpectations(sb_service_);
+  Mock::VerifyAndClearExpectations(sb_service_.get());
 
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               CheckDownloadUrl(ContainerEq(url_chain),
@@ -996,7 +996,7 @@ TEST_F(DownloadProtectionServiceTest, TestDownloadRequestTimeout) {
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               MatchDownloadWhitelistUrl(_))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*signature_util_, CheckSignature(tmp_path, _));
+  EXPECT_CALL(*signature_util_.get(), CheckSignature(tmp_path, _));
 
   download_service_->download_request_timeout_ms_ = 10;
   download_service_->CheckClientDownload(
@@ -1037,7 +1037,7 @@ TEST_F(DownloadProtectionServiceTest, TestDownloadItemDestroyed) {
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               MatchDownloadWhitelistUrl(_))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*signature_util_, CheckSignature(tmp_path, _));
+  EXPECT_CALL(*signature_util_.get(), CheckSignature(tmp_path, _));
 
   download_service_->CheckClientDownload(
       &item,
@@ -1065,7 +1065,8 @@ TEST_F(DownloadProtectionServiceTest, GetCertificateWhitelistStrings) {
   scoped_refptr<net::X509Certificate> cert(ReadTestCertificate("test_cn.pem"));
   ASSERT_TRUE(cert.get());
   std::vector<std::string> whitelist_strings;
-  GetCertificateWhitelistStrings(*cert, *issuer_cert, &whitelist_strings);
+  GetCertificateWhitelistStrings(
+      *cert.get(), *issuer_cert.get(), &whitelist_strings);
   // This also tests escaping of characters in the certificate attributes.
   EXPECT_THAT(whitelist_strings, ElementsAre(
       cert_base + "/CN=subject%2F%251"));
@@ -1073,59 +1074,66 @@ TEST_F(DownloadProtectionServiceTest, GetCertificateWhitelistStrings) {
   cert = ReadTestCertificate("test_cn_o.pem");
   ASSERT_TRUE(cert.get());
   whitelist_strings.clear();
-  GetCertificateWhitelistStrings(*cert, *issuer_cert, &whitelist_strings);
-  EXPECT_THAT(whitelist_strings, ElementsAre(
-      cert_base + "/CN=subject",
-      cert_base + "/CN=subject/O=org",
-      cert_base + "/O=org"));
+  GetCertificateWhitelistStrings(
+      *cert.get(), *issuer_cert.get(), &whitelist_strings);
+  EXPECT_THAT(whitelist_strings,
+              ElementsAre(cert_base + "/CN=subject",
+                          cert_base + "/CN=subject/O=org",
+                          cert_base + "/O=org"));
 
   cert = ReadTestCertificate("test_cn_o_ou.pem");
   ASSERT_TRUE(cert.get());
   whitelist_strings.clear();
-  GetCertificateWhitelistStrings(*cert, *issuer_cert, &whitelist_strings);
-  EXPECT_THAT(whitelist_strings, ElementsAre(
-      cert_base + "/CN=subject",
-      cert_base + "/CN=subject/O=org",
-      cert_base + "/CN=subject/O=org/OU=unit",
-      cert_base + "/CN=subject/OU=unit",
-      cert_base + "/O=org",
-      cert_base + "/O=org/OU=unit",
-      cert_base + "/OU=unit"));
+  GetCertificateWhitelistStrings(
+      *cert.get(), *issuer_cert.get(), &whitelist_strings);
+  EXPECT_THAT(whitelist_strings,
+              ElementsAre(cert_base + "/CN=subject",
+                          cert_base + "/CN=subject/O=org",
+                          cert_base + "/CN=subject/O=org/OU=unit",
+                          cert_base + "/CN=subject/OU=unit",
+                          cert_base + "/O=org",
+                          cert_base + "/O=org/OU=unit",
+                          cert_base + "/OU=unit"));
 
   cert = ReadTestCertificate("test_cn_ou.pem");
   ASSERT_TRUE(cert.get());
   whitelist_strings.clear();
-  GetCertificateWhitelistStrings(*cert, *issuer_cert, &whitelist_strings);
-  EXPECT_THAT(whitelist_strings, ElementsAre(
-      cert_base + "/CN=subject",
-      cert_base + "/CN=subject/OU=unit",
-      cert_base + "/OU=unit"));
+  GetCertificateWhitelistStrings(
+      *cert.get(), *issuer_cert.get(), &whitelist_strings);
+  EXPECT_THAT(whitelist_strings,
+              ElementsAre(cert_base + "/CN=subject",
+                          cert_base + "/CN=subject/OU=unit",
+                          cert_base + "/OU=unit"));
 
   cert = ReadTestCertificate("test_o.pem");
   ASSERT_TRUE(cert.get());
   whitelist_strings.clear();
-  GetCertificateWhitelistStrings(*cert, *issuer_cert, &whitelist_strings);
+  GetCertificateWhitelistStrings(
+      *cert.get(), *issuer_cert.get(), &whitelist_strings);
   EXPECT_THAT(whitelist_strings, ElementsAre(cert_base + "/O=org"));
 
   cert = ReadTestCertificate("test_o_ou.pem");
   ASSERT_TRUE(cert.get());
   whitelist_strings.clear();
-  GetCertificateWhitelistStrings(*cert, *issuer_cert, &whitelist_strings);
-  EXPECT_THAT(whitelist_strings, ElementsAre(
-      cert_base + "/O=org",
-      cert_base + "/O=org/OU=unit",
-      cert_base + "/OU=unit"));
+  GetCertificateWhitelistStrings(
+      *cert.get(), *issuer_cert.get(), &whitelist_strings);
+  EXPECT_THAT(whitelist_strings,
+              ElementsAre(cert_base + "/O=org",
+                          cert_base + "/O=org/OU=unit",
+                          cert_base + "/OU=unit"));
 
   cert = ReadTestCertificate("test_ou.pem");
   ASSERT_TRUE(cert.get());
   whitelist_strings.clear();
-  GetCertificateWhitelistStrings(*cert, *issuer_cert, &whitelist_strings);
+  GetCertificateWhitelistStrings(
+      *cert.get(), *issuer_cert.get(), &whitelist_strings);
   EXPECT_THAT(whitelist_strings, ElementsAre(cert_base + "/OU=unit"));
 
   cert = ReadTestCertificate("test_c.pem");
   ASSERT_TRUE(cert.get());
   whitelist_strings.clear();
-  GetCertificateWhitelistStrings(*cert, *issuer_cert, &whitelist_strings);
+  GetCertificateWhitelistStrings(
+      *cert.get(), *issuer_cert.get(), &whitelist_strings);
   EXPECT_THAT(whitelist_strings, ElementsAre());
 }
 }  // namespace safe_browsing
diff --git a/chrome/browser/safe_browsing/malware_details.cc b/chrome/browser/safe_browsing/malware_details.cc
index 7eb336d..95e047c 100644
--- a/chrome/browser/safe_browsing/malware_details.cc
+++ b/chrome/browser/safe_browsing/malware_details.cc
@@ -278,7 +278,7 @@ void MalwareDetails::OnRedirectionCollectionReady() {
 
   // Call the cache collector
   cache_collector_->StartCacheCollection(
-      request_context_getter_,
+      request_context_getter_.get(),
       &resources_,
       &cache_result_,
       base::Bind(&MalwareDetails::OnCacheCollectionReady, this));
diff --git a/chrome/browser/safe_browsing/malware_details_cache.cc b/chrome/browser/safe_browsing/malware_details_cache.cc
index cdd0090..f275ce6 100644
--- a/chrome/browser/safe_browsing/malware_details_cache.cc
+++ b/chrome/browser/safe_browsing/malware_details_cache.cc
@@ -76,7 +76,7 @@ void MalwareDetailsCacheCollector::OpenEntry() {
     return;
   }
 
-  if (!request_context_getter_) {
+  if (!request_context_getter_.get()) {
     DVLOG(1) << "Missing request context getter";
     AllDone(false);
     return;
@@ -84,7 +84,7 @@ void MalwareDetailsCacheCollector::OpenEntry() {
 
   current_fetch_.reset(net::URLFetcher::Create(
       GURL(resources_it_->first), net::URLFetcher::GET, this));
-  current_fetch_->SetRequestContext(request_context_getter_);
+  current_fetch_->SetRequestContext(request_context_getter_.get());
   // Only from cache, and don't save cookies.
   current_fetch_->SetLoadFlags(net::LOAD_ONLY_FROM_CACHE |
                                net::LOAD_DO_NOT_SAVE_COOKIES);
diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc
index 10daca1..ca1f658 100644
--- a/chrome/browser/safe_browsing/malware_details_unittest.cc
+++ b/chrome/browser/safe_browsing/malware_details_unittest.cc
@@ -76,7 +76,7 @@ void WriteHeaders(disk_cache::Entry* entry, const std::string headers) {
   int len = static_cast<int>(pickle.size());
 
   net::TestCompletionCallback cb;
-  int rv = entry->WriteData(0, 0, buf, len, cb.callback(), true);
+  int rv = entry->WriteData(0, 0, buf.get(), len, cb.callback(), true);
   ASSERT_EQ(len, cb.GetResult(rv));
 }
 
@@ -89,7 +89,7 @@ void WriteData(disk_cache::Entry* entry, const std::string data) {
   memcpy(buf->data(), data.data(), data.length());
 
   net::TestCompletionCallback cb;
-  int rv = entry->WriteData(1, 0, buf, len, cb.callback(), true);
+  int rv = entry->WriteData(1, 0, buf.get(), len, cb.callback(), true);
   ASSERT_EQ(len, cb.GetResult(rv));
 }
 
@@ -333,10 +333,10 @@ TEST_F(MalwareDetailsTest, MalwareSubResource) {
   UnsafeResource resource;
   InitResource(&resource, true, GURL(kMalwareURL));
 
-  scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
-      ui_manager_, web_contents(), resource, NULL);
+  scoped_refptr<MalwareDetailsWrap> report =
+      new MalwareDetailsWrap(ui_manager_.get(), web_contents(), resource, NULL);
 
-  std::string serialized = WaitForSerializedReport(report);
+  std::string serialized = WaitForSerializedReport(report.get());
 
   ClientMalwareReportRequest actual;
   actual.ParseFromString(serialized);
@@ -369,7 +369,7 @@ TEST_F(MalwareDetailsTest, MalwareSubResourceWithOriginalUrl) {
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       ui_manager_.get(), web_contents(), resource, NULL);
 
-  std::string serialized = WaitForSerializedReport(report);
+  std::string serialized = WaitForSerializedReport(report.get());
 
   ClientMalwareReportRequest actual;
   actual.ParseFromString(serialized);
@@ -423,7 +423,7 @@ TEST_F(MalwareDetailsTest, MalwareDOMDetails) {
 
   base::MessageLoop::current()->RunUntilIdle();
 
-  std::string serialized = WaitForSerializedReport(report);
+  std::string serialized = WaitForSerializedReport(report.get());
   ClientMalwareReportRequest actual;
   actual.ParseFromString(serialized);
 
@@ -463,7 +463,7 @@ TEST_F(MalwareDetailsTest, NotPublicUrl) {
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       ui_manager_.get(), web_contents(), resource, NULL);
 
-  std::string serialized = WaitForSerializedReport(report);
+  std::string serialized = WaitForSerializedReport(report.get());
   ClientMalwareReportRequest actual;
   actual.ParseFromString(serialized);
 
@@ -495,7 +495,7 @@ TEST_F(MalwareDetailsTest, MalwareWithRedirectUrl) {
   scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
       ui_manager_.get(), web_contents(), resource, NULL);
 
-  std::string serialized = WaitForSerializedReport(report);
+  std::string serialized = WaitForSerializedReport(report.get());
   ClientMalwareReportRequest actual;
   actual.ParseFromString(serialized);
 
@@ -556,7 +556,7 @@ TEST_F(MalwareDetailsTest, HTTPCache) {
   base::MessageLoop::current()->RunUntilIdle();
 
   DVLOG(1) << "Getting serialized report";
-  std::string serialized = WaitForSerializedReport(report);
+  std::string serialized = WaitForSerializedReport(report.get());
   ClientMalwareReportRequest actual;
   actual.ParseFromString(serialized);
 
@@ -627,7 +627,7 @@ TEST_F(MalwareDetailsTest, HTTPCacheNoEntries) {
   base::MessageLoop::current()->RunUntilIdle();
 
   DVLOG(1) << "Getting serialized report";
-  std::string serialized = WaitForSerializedReport(report);
+  std::string serialized = WaitForSerializedReport(report.get());
   ClientMalwareReportRequest actual;
   actual.ParseFromString(serialized);
 
@@ -675,7 +675,7 @@ TEST_F(MalwareDetailsTest, HistoryServiceUrls) {
   // Let the redirects callbacks complete.
   base::MessageLoop::current()->RunUntilIdle();
 
-  std::string serialized = WaitForSerializedReport(report);
+  std::string serialized = WaitForSerializedReport(report.get());
   ClientMalwareReportRequest actual;
   actual.ParseFromString(serialized);
 
diff --git a/chrome/browser/safe_browsing/ping_manager.cc b/chrome/browser/safe_browsing/ping_manager.cc
index 56580d00..baa8db2 100644
--- a/chrome/browser/safe_browsing/ping_manager.cc
+++ b/chrome/browser/safe_browsing/ping_manager.cc
@@ -81,7 +81,7 @@ void SafeBrowsingPingManager::ReportSafeBrowsingHit(
       post_data.empty() ? net::URLFetcher::GET : net::URLFetcher::POST,
       this);
   report->SetLoadFlags(net::LOAD_DISABLE_CACHE);
-  report->SetRequestContext(request_context_getter_);
+  report->SetRequestContext(request_context_getter_.get());
   if (!post_data.empty())
     report->SetUploadData("text/plain", post_data);
   safebrowsing_reports_.insert(report);
@@ -95,7 +95,7 @@ void SafeBrowsingPingManager::ReportMalwareDetails(
   net::URLFetcher* fetcher = net::URLFetcher::Create(
       report_url, net::URLFetcher::POST, this);
   fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE);
-  fetcher->SetRequestContext(request_context_getter_);
+  fetcher->SetRequestContext(request_context_getter_.get());
   fetcher->SetUploadData("application/octet-stream", report);
   // Don't try too hard to send reports on failures.
   fetcher->SetAutomaticallyRetryOn5xx(false);
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
index 437b41c..1f39a95 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -185,7 +185,7 @@ void SafeBrowsingProtocolManager::GetFullHash(
   parser.FormatGetHash(prefixes, &get_hash);
 
   fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE);
-  fetcher->SetRequestContext(request_context_getter_);
+  fetcher->SetRequestContext(request_context_getter_.get());
   fetcher->SetUploadData("text/plain", get_hash);
   fetcher->Start();
 }
@@ -553,7 +553,7 @@ bool SafeBrowsingProtocolManager::IssueBackupUpdateRequest(
   request_.reset(net::URLFetcher::Create(
       url_fetcher_id_++, backup_update_url, net::URLFetcher::POST, this));
   request_->SetLoadFlags(net::LOAD_DISABLE_CACHE);
-  request_->SetRequestContext(request_context_getter_);
+  request_->SetRequestContext(request_context_getter_.get());
   request_->SetUploadData("text/plain", update_list_data_);
   request_->Start();
 
@@ -580,7 +580,7 @@ void SafeBrowsingProtocolManager::IssueChunkRequest() {
   request_.reset(net::URLFetcher::Create(
       url_fetcher_id_++, chunk_url, net::URLFetcher::GET, this));
   request_->SetLoadFlags(net::LOAD_DISABLE_CACHE);
-  request_->SetRequestContext(request_context_getter_);
+  request_->SetRequestContext(request_context_getter_.get());
   chunk_request_start_ = base::Time::Now();
   request_->Start();
 }
@@ -627,7 +627,7 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete(
   request_.reset(net::URLFetcher::Create(
       url_fetcher_id_++, update_url, net::URLFetcher::POST, this));
   request_->SetLoadFlags(net::LOAD_DISABLE_CACHE);
-  request_->SetRequestContext(request_context_getter_);
+  request_->SetRequestContext(request_context_getter_.get());
   request_->SetUploadData("text/plain", update_list_data_);
   request_->Start();
 
diff --git a/chrome/browser/safe_browsing/protocol_manager_unittest.cc b/chrome/browser/safe_browsing/protocol_manager_unittest.cc
index ca89ce5..99ab5d2 100644
--- a/chrome/browser/safe_browsing/protocol_manager_unittest.cc
+++ b/chrome/browser/safe_browsing/protocol_manager_unittest.cc
@@ -298,7 +298,7 @@ void HandleAddChunks(
   delete chunks;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner(
       base::ThreadTaskRunnerHandle::Get());
-  if (!task_runner)
+  if (!task_runner.get())
     return;
   task_runner->PostTask(FROM_HERE, callback);
 }
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index e0b6ec1..6678557 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -226,8 +226,7 @@ SafeBrowsingBlockingPage::SafeBrowsingBlockingPage(
   // reports.
   if (unsafe_resources.size() == 1 &&
       unsafe_resources[0].threat_type == SB_THREAT_TYPE_URL_MALWARE &&
-      malware_details_ == NULL &&
-      CanShowMalwareDetailsOption()) {
+      malware_details_.get() == NULL && CanShowMalwareDetailsOption()) {
     malware_details_ = MalwareDetails::NewMalwareDetails(
         ui_manager_, web_contents, unsafe_resources[0]);
   }
@@ -702,7 +701,7 @@ void SafeBrowsingBlockingPage::RecordUserReactionTime(
 }
 
 void SafeBrowsingBlockingPage::FinishMalwareDetails(int64 delay_ms) {
-  if (malware_details_ == NULL)
+  if (malware_details_.get() == NULL)
     return;  // Not all interstitials have malware details (eg phishing).
 
   if (IsPrefEnabled(prefs::kSafeBrowsingReportingEnabled)) {
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
index 21ed753..5a057ea 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
@@ -175,7 +175,7 @@ class SafeBrowsingBlockingPageTest : public ChromeRenderViewHostTestHarness {
   void ShowInterstitial(bool is_subresource, const char* url) {
     SafeBrowsingUIManager::UnsafeResource resource;
     InitResource(&resource, is_subresource, GURL(url));
-    SafeBrowsingBlockingPage::ShowBlockingPage(ui_manager_, resource);
+    SafeBrowsingBlockingPage::ShowBlockingPage(ui_manager_.get(), resource);
   }
 
   // Returns the SafeBrowsingBlockingPage currently showing or NULL if none is
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index 8c40f7b..e02ae21 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -198,13 +198,11 @@ void SafeBrowsingService::Initialize() {
 #if defined(FULL_SAFE_BROWSING)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableClientSidePhishingDetection)) {
-    csd_service_.reset(
-        safe_browsing::ClientSideDetectionService::Create(
-            url_request_context_getter_));
+    csd_service_.reset(safe_browsing::ClientSideDetectionService::Create(
+        url_request_context_getter_.get()));
   }
   download_service_.reset(new safe_browsing::DownloadProtectionService(
-      this,
-      url_request_context_getter_));
+      this, url_request_context_getter_.get()));
 #endif
 
   // Track the safe browsing preference of existing profiles.
@@ -317,7 +315,7 @@ void SafeBrowsingService::InitURLRequestContextOnIOThread(
     url_request_context_->CopyFrom(
         system_url_request_context_getter->GetURLRequestContext());
   }
-  url_request_context_->set_cookie_store(cookie_store);
+  url_request_context_->set_cookie_store(cookie_store.get());
 }
 
 void SafeBrowsingService::DestroyURLRequestContextOnIOThread() {
@@ -368,21 +366,18 @@ void SafeBrowsingService::StartOnIOThread() {
   }
 
 #if defined(FULL_SAFE_BROWSING)
-  DCHECK(database_manager_);
+  DCHECK(database_manager_.get());
   database_manager_->StartOnIOThread();
 
   DCHECK(!protocol_manager_);
-  protocol_manager_ =
-      SafeBrowsingProtocolManager::Create(database_manager_,
-                                          url_request_context_getter_,
-                                          config);
+  protocol_manager_ = SafeBrowsingProtocolManager::Create(
+      database_manager_.get(), url_request_context_getter_.get(), config);
   protocol_manager_->Initialize();
 #endif
 
   DCHECK(!ping_manager_);
-  ping_manager_ =
-      SafeBrowsingPingManager::Create(url_request_context_getter_,
-                                      config);
+  ping_manager_ = SafeBrowsingPingManager::Create(
+      url_request_context_getter_.get(), config);
 }
 
 void SafeBrowsingService::StopOnIOThread(bool shutdown) {
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index 40f0ab6..6d5066e 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -964,7 +964,7 @@ class SafeBrowsingDatabaseManagerCookieTest : public InProcessBrowserTest {
 
   virtual void SetUpOnMainThread() OVERRIDE {
     sb_service_ = g_browser_process->safe_browsing_service();
-    ASSERT_TRUE(sb_service_ != NULL);
+    ASSERT_TRUE(sb_service_.get() != NULL);
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
@@ -989,9 +989,10 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingDatabaseManagerCookieTest,
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE,
       content::Source<SafeBrowsingDatabaseManager>(
-          sb_service_->database_manager()));
+          sb_service_->database_manager().get()));
   BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
+      BrowserThread::IO,
+      FROM_HERE,
       base::Bind(&SafeBrowsingDatabaseManagerCookieTest::ForceUpdate, this));
   observer.Wait();
 }
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
index 78a225c..c0b1d40 100644
--- a/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -170,7 +170,7 @@ class SafeBrowsingServerTest : public InProcessBrowserTest {
   }
 
   SafeBrowsingDatabaseManager* database_manager() {
-    return safe_browsing_service_->database_manager();
+    return safe_browsing_service_->database_manager().get();
   }
 
   bool is_checked_url_in_db() {
diff --git a/chrome/browser/safe_browsing/two_phase_uploader.cc b/chrome/browser/safe_browsing/two_phase_uploader.cc
index 93720ea..c5558d1 100644
--- a/chrome/browser/safe_browsing/two_phase_uploader.cc
+++ b/chrome/browser/safe_browsing/two_phase_uploader.cc
@@ -162,7 +162,7 @@ void TwoPhaseUploaderImpl::UploadMetadata() {
   state_ = UPLOAD_METADATA;
   url_fetcher_.reset(net::URLFetcher::Create(base_url_, net::URLFetcher::POST,
                                              this));
-  url_fetcher_->SetRequestContext(url_request_context_getter_);
+  url_fetcher_->SetRequestContext(url_request_context_getter_.get());
   url_fetcher_->SetExtraRequestHeaders(kStartHeader);
   url_fetcher_->SetUploadData(kUploadContentType, metadata_);
   url_fetcher_->Start();
@@ -174,12 +174,9 @@ void TwoPhaseUploaderImpl::UploadFile() {
 
   url_fetcher_.reset(net::URLFetcher::Create(upload_url_, net::URLFetcher::PUT,
                                              this));
-  url_fetcher_->SetRequestContext(url_request_context_getter_);
-  url_fetcher_->SetUploadFilePath(kUploadContentType,
-                                  file_path_,
-                                  0,
-                                  kuint64max,
-                                  file_task_runner_);
+  url_fetcher_->SetRequestContext(url_request_context_getter_.get());
+  url_fetcher_->SetUploadFilePath(
+      kUploadContentType, file_path_, 0, kuint64max, file_task_runner_);
   url_fetcher_->Start();
 }
 
diff --git a/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc b/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc
index 8a58e2f..11fda28 100644
--- a/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc
+++ b/chrome/browser/safe_browsing/two_phase_uploader_unittest.cc
@@ -83,14 +83,14 @@ TEST_F(TwoPhaseUploaderTest, UploadFile) {
   ASSERT_TRUE(test_server.Start());
   Delegate delegate;
   scoped_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
-      url_request_context_getter_,
+      url_request_context_getter_.get(),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
       test_server.GetURL("start"),
       "metadata",
       GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
-      base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
-                 runner)));
+      base::Bind(
+          &Delegate::FinishCallback, base::Unretained(&delegate), runner)));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::STATE_SUCCESS, delegate.state_);
@@ -109,14 +109,14 @@ TEST_F(TwoPhaseUploaderTest, BadPhaseOneResponse) {
   ASSERT_TRUE(test_server.Start());
   Delegate delegate;
   scoped_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
-      url_request_context_getter_,
+      url_request_context_getter_.get(),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
       test_server.GetURL("start?p1code=500"),
       "metadata",
       GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
-      base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
-                 runner)));
+      base::Bind(
+          &Delegate::FinishCallback, base::Unretained(&delegate), runner)));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_METADATA, delegate.state_);
@@ -131,14 +131,14 @@ TEST_F(TwoPhaseUploaderTest, BadPhaseTwoResponse) {
   ASSERT_TRUE(test_server.Start());
   Delegate delegate;
   scoped_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
-      url_request_context_getter_,
+      url_request_context_getter_.get(),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
       test_server.GetURL("start?p2code=500"),
       "metadata",
       GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
-      base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
-                 runner)));
+      base::Bind(
+          &Delegate::FinishCallback, base::Unretained(&delegate), runner)));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_FILE, delegate.state_);
@@ -157,14 +157,14 @@ TEST_F(TwoPhaseUploaderTest, PhaseOneConnectionClosed) {
   ASSERT_TRUE(test_server.Start());
   Delegate delegate;
   scoped_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
-      url_request_context_getter_,
+      url_request_context_getter_.get(),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
       test_server.GetURL("start?p1close=1"),
       "metadata",
       GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
-      base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
-                 runner)));
+      base::Bind(
+          &Delegate::FinishCallback, base::Unretained(&delegate), runner)));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_METADATA, delegate.state_);
@@ -179,14 +179,14 @@ TEST_F(TwoPhaseUploaderTest, PhaseTwoConnectionClosed) {
   ASSERT_TRUE(test_server.Start());
   Delegate delegate;
   scoped_ptr<TwoPhaseUploader> uploader(TwoPhaseUploader::Create(
-      url_request_context_getter_,
+      url_request_context_getter_.get(),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
       test_server.GetURL("start?p2close=1"),
       "metadata",
       GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
-      base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
-                 runner)));
+      base::Bind(
+          &Delegate::FinishCallback, base::Unretained(&delegate), runner)));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_FILE, delegate.state_);
diff --git a/chrome/browser/safe_browsing/ui_manager.cc b/chrome/browser/safe_browsing/ui_manager.cc
index e060a6e..6b830af 100644
--- a/chrome/browser/safe_browsing/ui_manager.cc
+++ b/chrome/browser/safe_browsing/ui_manager.cc
@@ -219,7 +219,7 @@ void SafeBrowsingUIManager::ReportSafeBrowsingHitOnIOThread(
 
   // The service may delete the ping manager (i.e. when user disabling service,
   // etc). This happens on the IO thread.
-  if (sb_service_ == NULL || sb_service_->ping_manager() == NULL)
+  if (sb_service_.get() == NULL || sb_service_->ping_manager() == NULL)
     return;
 
   DVLOG(1) << "ReportSafeBrowsingHit: " << malicious_url << " " << page_url
@@ -239,7 +239,7 @@ void SafeBrowsingUIManager::SendSerializedMalwareDetails(
 
   // The service may delete the ping manager (i.e. when user disabling service,
   // etc). This happens on the IO thread.
-  if (sb_service_ == NULL || sb_service_->ping_manager() == NULL)
+  if (sb_service_.get() == NULL || sb_service_->ping_manager() == NULL)
     return;
 
   if (!serialized.empty()) {
diff --git a/chrome/browser/search/iframe_source.cc b/chrome/browser/search/iframe_source.cc
index 0bb0e3e..d3fbb42 100644
--- a/chrome/browser/search/iframe_source.cc
+++ b/chrome/browser/search/iframe_source.cc
@@ -73,7 +73,7 @@ void IframeSource::SendResource(
     const content::URLDataSource::GotDataCallback& callback) {
   scoped_refptr<base::RefCountedStaticMemory> response(
       ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id));
-  callback.Run(response);
+  callback.Run(response.get());
 }
 
 void IframeSource::SendJSWithOrigin(
diff --git a/chrome/browser/search/iframe_source_unittest.cc b/chrome/browser/search/iframe_source_unittest.cc
index 0091531..b560c02 100644
--- a/chrome/browser/search/iframe_source_unittest.cc
+++ b/chrome/browser/search/iframe_source_unittest.cc
@@ -83,7 +83,7 @@ class IframeSourceTest : public testing::Test {
   TestIframeSource* source() { return source_.get(); }
 
   std::string response_string() {
-    if (response_) {
+    if (response_.get()) {
       return std::string(reinterpret_cast<const char*>(response_->front()),
                          response_->size());
     }
diff --git a/chrome/browser/search/instant_io_context.cc b/chrome/browser/search/instant_io_context.cc
index 73f49d2..ff70801 100644
--- a/chrome/browser/search/instant_io_context.cc
+++ b/chrome/browser/search/instant_io_context.cc
@@ -51,7 +51,7 @@ void InstantIOContext::SetUserDataOnIO(
     scoped_refptr<InstantIOContext> instant_io_context) {
   resource_context->SetUserData(
       InstantIOContext::kInstantIOContextKeyName,
-      new base::UserDataAdapter<InstantIOContext>(instant_io_context));
+      new base::UserDataAdapter<InstantIOContext>(instant_io_context.get()));
 }
 
 // static
diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc
index e6db319..8467611 100644
--- a/chrome/browser/search/instant_service.cc
+++ b/chrome/browser/search/instant_service.cc
@@ -110,11 +110,12 @@ bool InstantService::IsInstantPath(const GURL& url) {
 void InstantService::AddInstantProcess(int process_id) {
   process_ids_.insert(process_id);
 
-  if (instant_io_context_) {
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&InstantIOContext::AddInstantProcessOnIO,
-                   instant_io_context_, process_id));
+  if (instant_io_context_.get()) {
+    BrowserThread::PostTask(BrowserThread::IO,
+                            FROM_HERE,
+                            base::Bind(&InstantIOContext::AddInstantProcessOnIO,
+                                       instant_io_context_,
+                                       process_id));
   }
 }
 
@@ -127,7 +128,7 @@ void InstantService::AddMostVisitedItems(
   most_visited_item_cache_.AddItems(items);
 
   // Post task to the IO thread to copy the data.
-  if (instant_io_context_) {
+  if (instant_io_context_.get()) {
     std::vector<InstantMostVisitedItemIDPair> items;
     most_visited_item_cache_.GetCurrentItems(&items);
     BrowserThread::PostTask(
@@ -153,9 +154,10 @@ bool InstantService::GetMostVisitedItemForID(
 void InstantService::Shutdown() {
   process_ids_.clear();
 
-  if (instant_io_context_) {
+  if (instant_io_context_.get()) {
     BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
+        BrowserThread::IO,
+        FROM_HERE,
         base::Bind(&InstantIOContext::ClearInstantProcessesOnIO,
                    instant_io_context_));
   }
@@ -171,11 +173,13 @@ void InstantService::Observe(int type,
           content::Source<content::RenderProcessHost>(source)->GetID();
       process_ids_.erase(process_id);
 
-      if (instant_io_context_) {
+      if (instant_io_context_.get()) {
         BrowserThread::PostTask(
-            BrowserThread::IO, FROM_HERE,
+            BrowserThread::IO,
+            FROM_HERE,
             base::Bind(&InstantIOContext::RemoveInstantProcessOnIO,
-                       instant_io_context_, process_id));
+                       instant_io_context_,
+                       process_id));
       }
       break;
     }
diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc
index 98e0f88..9622653 100644
--- a/chrome/browser/search/local_ntp_source.cc
+++ b/chrome/browser/search/local_ntp_source.cc
@@ -115,7 +115,7 @@ void LocalNtpSource::StartDataRequest(
       scoped_refptr<base::RefCountedStaticMemory> response(
           ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
               kResources[i].identifier));
-      callback.Run(response);
+      callback.Run(response.get());
       return;
     }
   }
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index 7588369..f5c9e63 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -306,7 +306,7 @@ TemplateURLService::TemplateURLService(const Initializer* initializers,
 }
 
 TemplateURLService::~TemplateURLService() {
-  if (service_)
+  if (service_.get())
     Shutdown();
   STLDeleteElements(&template_urls_);
 }
diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc
index 70b0157..2b04211 100644
--- a/chrome/browser/service/service_process_control.cc
+++ b/chrome/browser/service/service_process_control.cc
@@ -100,7 +100,7 @@ void ServiceProcessControl::Launch(const base::Closure& success_task,
     connect_failure_tasks_.push_back(failure);
 
   // If we already in the process of launching, then we are done.
-  if (launcher_)
+  if (launcher_.get())
     return;
 
   // If the service process is already running then connects to it.
diff --git a/chrome/browser/sessions/base_session_service.h b/chrome/browser/sessions/base_session_service.h
index 2e7b258..67175a5 100644
--- a/chrome/browser/sessions/base_session_service.h
+++ b/chrome/browser/sessions/base_session_service.h
@@ -60,7 +60,7 @@ class BaseSessionService : public CancelableRequestProvider {
   virtual ~BaseSessionService();
 
   // Returns the backend.
-  SessionBackend* backend() const { return backend_; }
+  SessionBackend* backend() const { return backend_.get(); }
 
   // Returns the set of commands that needed to be scheduled. The commands
   // in the vector are owned by BaseSessionService, until they are scheduled
diff --git a/chrome/browser/sessions/tab_restore_service_helper.cc b/chrome/browser/sessions/tab_restore_service_helper.cc
index 0b0e0e5..2b13861 100644
--- a/chrome/browser/sessions/tab_restore_service_helper.cc
+++ b/chrome/browser/sessions/tab_restore_service_helper.cc
@@ -234,15 +234,16 @@ void TabRestoreServiceHelper::RestoreEntryById(
                                                    window->app_name);
       for (size_t tab_i = 0; tab_i < window->tabs.size(); ++tab_i) {
         const Tab& tab = window->tabs[tab_i];
-        WebContents* restored_tab =
-            delegate->AddRestoredTab(tab.navigations, delegate->GetTabCount(),
-                                     tab.current_navigation_index,
-                                     tab.extension_app_id,
-                                     static_cast<int>(tab_i) ==
-                                         window->selected_tab_index,
-                                     tab.pinned, tab.from_last_session,
-                                     tab.session_storage_namespace,
-                                     tab.user_agent_override);
+        WebContents* restored_tab = delegate->AddRestoredTab(
+            tab.navigations,
+            delegate->GetTabCount(),
+            tab.current_navigation_index,
+            tab.extension_app_id,
+            static_cast<int>(tab_i) == window->selected_tab_index,
+            tab.pinned,
+            tab.from_last_session,
+            tab.session_storage_namespace.get(),
+            tab.user_agent_override);
         if (restored_tab) {
           restored_tab->GetController().LoadIfNecessary();
           RecordAppLaunch(profile_, tab);
@@ -439,7 +440,7 @@ TabRestoreServiceDelegate* TabRestoreServiceHelper::RestoreTab(
                                  tab.current_navigation_index,
                                  tab.from_last_session,
                                  tab.extension_app_id,
-                                 tab.session_storage_namespace,
+                                 tab.session_storage_namespace.get(),
                                  tab.user_agent_override);
   } else {
     // We only respsect the tab's original browser if there's no disposition.
@@ -469,16 +470,16 @@ TabRestoreServiceDelegate* TabRestoreServiceHelper::RestoreTab(
       tab_index = delegate->GetTabCount();
     }
 
-    WebContents* web_contents = delegate->AddRestoredTab(
-        tab.navigations,
-        tab_index,
-        tab.current_navigation_index,
-        tab.extension_app_id,
-        disposition != NEW_BACKGROUND_TAB,
-        tab.pinned,
-        tab.from_last_session,
-        tab.session_storage_namespace,
-        tab.user_agent_override);
+    WebContents* web_contents =
+        delegate->AddRestoredTab(tab.navigations,
+                                 tab_index,
+                                 tab.current_navigation_index,
+                                 tab.extension_app_id,
+                                 disposition != NEW_BACKGROUND_TAB,
+                                 tab.pinned,
+                                 tab.from_last_session,
+                                 tab.session_storage_namespace.get(),
+                                 tab.user_agent_override);
     web_contents->GetController().LoadIfNecessary();
   }
   RecordAppLaunch(profile_, tab);
diff --git a/chrome/browser/signin/oauth2_token_service.cc b/chrome/browser/signin/oauth2_token_service.cc
index aeacd41..6b3d1b8 100644
--- a/chrome/browser/signin/oauth2_token_service.cc
+++ b/chrome/browser/signin/oauth2_token_service.cc
@@ -171,7 +171,7 @@ OAuth2TokenService::Fetcher::Fetcher(
       retry_number_(0),
       error_(GoogleServiceAuthError::SERVICE_UNAVAILABLE) {
   DCHECK(oauth2_token_service_);
-  DCHECK(getter_);
+  DCHECK(getter_.get());
   DCHECK(refresh_token_.length());
   waiting_requests_.push_back(waiting_request);
 }
@@ -183,7 +183,7 @@ OAuth2TokenService::Fetcher::~Fetcher() {
 }
 
 void OAuth2TokenService::Fetcher::Start() {
-  fetcher_.reset(new OAuth2AccessTokenFetcher(this, getter_));
+  fetcher_.reset(new OAuth2AccessTokenFetcher(this, getter_.get()));
   fetcher_->Start(GaiaUrls::GetInstance()->oauth2_chrome_client_id(),
                   GaiaUrls::GetInstance()->oauth2_chrome_client_secret(),
                   refresh_token_,
@@ -347,9 +347,12 @@ scoped_ptr<OAuth2TokenService::Request> OAuth2TokenService::StartRequest(
     iter->second->AddWaitingRequest(request->AsWeakPtr());
     return request.PassAs<Request>();
   }
-  pending_fetchers_[fetch_parameters] = Fetcher::CreateAndStart(
-      this, request_context_getter_, refresh_token, scopes,
-      request->AsWeakPtr());
+  pending_fetchers_[fetch_parameters] =
+      Fetcher::CreateAndStart(this,
+                              request_context_getter_.get(),
+                              refresh_token,
+                              scopes,
+                              request->AsWeakPtr());
   return request.PassAs<Request>();
 }
 
diff --git a/chrome/browser/signin/oauth2_token_service_unittest.cc b/chrome/browser/signin/oauth2_token_service_unittest.cc
index 4acffb9..105ad839 100644
--- a/chrome/browser/signin/oauth2_token_service_unittest.cc
+++ b/chrome/browser/signin/oauth2_token_service_unittest.cc
@@ -71,7 +71,8 @@ class OAuth2TokenServiceTest : public TokenServiceTestHarness {
     TokenServiceTestHarness::SetUp();
     io_thread_.reset(new content::TestBrowserThread(content::BrowserThread::IO,
                                                     &message_loop_));
-    oauth2_service_.reset(new TestOAuth2TokenService(request_context_getter_));
+    oauth2_service_.reset(
+        new TestOAuth2TokenService(request_context_getter_.get()));
   }
 
   virtual void TearDown() OVERRIDE {
diff --git a/chrome/browser/signin/signin_manager_cookie_helper.cc b/chrome/browser/signin/signin_manager_cookie_helper.cc
index 8c3fe2c..30480af 100644
--- a/chrome/browser/signin/signin_manager_cookie_helper.cc
+++ b/chrome/browser/signin/signin_manager_cookie_helper.cc
@@ -40,7 +40,7 @@ void SigninManagerCookieHelper::FetchGaiaCookiesOnIOThread() {
   scoped_refptr<net::CookieMonster> cookie_monster =
       request_context_getter_->GetURLRequestContext()->
       cookie_store()->GetCookieMonster();
-  if (cookie_monster) {
+  if (cookie_monster.get()) {
     cookie_monster->GetAllCookiesForURLAsync(
         GaiaUrls::GetInstance()->gaia_url(),
         base::Bind(&SigninManagerCookieHelper::OnGaiaCookiesFetched, this));
diff --git a/chrome/browser/signin/token_service.cc b/chrome/browser/signin/token_service.cc
index 93645e0..33ef342 100644
--- a/chrome/browser/signin/token_service.cc
+++ b/chrome/browser/signin/token_service.cc
@@ -122,7 +122,7 @@ void TokenService::AddAuthTokenManually(const std::string& service,
     CHECK_GE(index, 0);
     // iOS fetches the service tokens outside of the TokenService.
     if (!fetchers_[index].get()) {
-      fetchers_[index].reset(new GaiaAuthFetcher(this, source_, getter_));
+      fetchers_[index].reset(new GaiaAuthFetcher(this, source_, getter_.get()));
     }
     fetchers_[index]->StartLsoForOAuthLoginTokenExchange(auth_token);
   }
@@ -227,10 +227,9 @@ void TokenService::StartFetchingTokens() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(AreCredentialsValid());
   for (size_t i = 0; i < arraysize(kServices); i++) {
-    fetchers_[i].reset(new GaiaAuthFetcher(this, source_, getter_));
-    fetchers_[i]->StartIssueAuthToken(credentials_.sid,
-                                      credentials_.lsid,
-                                      kServices[i]);
+    fetchers_[i].reset(new GaiaAuthFetcher(this, source_, getter_.get()));
+    fetchers_[i]->StartIssueAuthToken(
+        credentials_.sid, credentials_.lsid, kServices[i]);
   }
 }
 
diff --git a/chrome/browser/speech/chrome_speech_recognition_preferences.cc b/chrome/browser/speech/chrome_speech_recognition_preferences.cc
index d062a90..62be83a 100644
--- a/chrome/browser/speech/chrome_speech_recognition_preferences.cc
+++ b/chrome/browser/speech/chrome_speech_recognition_preferences.cc
@@ -97,7 +97,7 @@ ChromeSpeechRecognitionPreferences::Service::~Service() {
 }
 
 void ChromeSpeechRecognitionPreferences::Service::Shutdown() {
-  DCHECK(preferences_);
+  DCHECK(preferences_.get());
   preferences_->DetachFromProfile();
 }
 
@@ -115,7 +115,7 @@ ChromeSpeechRecognitionPreferences::GetForProfile(Profile* profile) {
     ret = Factory::GetInstance()->GetForProfile(profile);
   }
 
-  if (!ret) {
+  if (!ret.get()) {
     // Create a detached preferences object if no profile is provided.
     ret = new ChromeSpeechRecognitionPreferences(NULL);
   }
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc
index 019d604..d49d6be 100644
--- a/chrome/browser/ssl/ssl_add_cert_handler.cc
+++ b/chrome/browser/ssl/ssl_add_cert_handler.cc
@@ -38,7 +38,7 @@ SSLAddCertHandler::SSLAddCertHandler(net::URLRequest* request,
 SSLAddCertHandler::~SSLAddCertHandler() {}
 
 void SSLAddCertHandler::Run() {
-  int cert_error = net::CertDatabase::GetInstance()->CheckUserCert(cert_);
+  int cert_error = net::CertDatabase::GetInstance()->CheckUserCert(cert_.get());
   if (cert_error != net::OK) {
     LOG_IF(ERROR, cert_error == net::ERR_NO_PRIVATE_KEY_FOR_CERT)
         << "No corresponding private key in store for cert: "
@@ -70,7 +70,7 @@ void SSLAddCertHandler::AskToAddCert() {
 void SSLAddCertHandler::Finished(bool add_cert) {
   int cert_error = net::OK;
   if (add_cert)
-    cert_error = net::CertDatabase::GetInstance()->AddUserCert(cert_);
+    cert_error = net::CertDatabase::GetInstance()->AddUserCert(cert_.get());
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.h b/chrome/browser/ssl/ssl_add_cert_handler.h
index 2d040ef..16320fd 100644
--- a/chrome/browser/ssl/ssl_add_cert_handler.h
+++ b/chrome/browser/ssl/ssl_add_cert_handler.h
@@ -22,7 +22,7 @@ class SSLAddCertHandler : public base::RefCountedThreadSafe<SSLAddCertHandler> {
   SSLAddCertHandler(net::URLRequest* request, net::X509Certificate* cert,
                     int render_process_host_id, int render_view_id);
 
-  net::X509Certificate* cert()  { return cert_; }
+  net::X509Certificate* cert() { return cert_.get(); }
 
   int network_request_id() const { return network_request_id_; }
 
diff --git a/chrome/browser/ssl/ssl_add_certificate.cc b/chrome/browser/ssl/ssl_add_certificate.cc
index fd1d510..27b57ce 100644
--- a/chrome/browser/ssl/ssl_add_certificate.cc
+++ b/chrome/browser/ssl/ssl_add_certificate.cc
@@ -31,7 +31,7 @@ void SSLAddCertificate(
   // intentional here.
 
   // The handler will run the UI and delete itself when it's finished.
-  new SSLAddCertHandler(request, cert, render_process_id, render_view_id);
+  new SSLAddCertHandler(request, cert.get(), render_process_id, render_view_id);
 }
 
 }  // namespace chrome
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index b7ed0b8..4abf267 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -205,9 +205,10 @@ SSLBlockingPage::~SSLBlockingPage() {
 std::string SSLBlockingPage::GetHTMLContents() {
   // Let's build the html error page.
   DictionaryValue strings;
-  SSLErrorInfo error_info = SSLErrorInfo::CreateError(
-      SSLErrorInfo::NetErrorToErrorType(cert_error_), ssl_info_.cert,
-      request_url_);
+  SSLErrorInfo error_info =
+      SSLErrorInfo::CreateError(SSLErrorInfo::NetErrorToErrorType(cert_error_),
+                                ssl_info_.cert.get(),
+                                request_url_);
 
   int resource_id = IDR_SSL_ROAD_BLOCK_HTML;
   strings.SetString("headLine", error_info.title());
@@ -277,7 +278,7 @@ std::string SSLBlockingPage::GetHTMLContents() {
 
 void SSLBlockingPage::OverrideEntry(NavigationEntry* entry) {
   int cert_id = content::CertStore::GetInstance()->StoreCert(
-      ssl_info_.cert, web_contents_->GetRenderProcessHost()->GetID());
+      ssl_info_.cert.get(), web_contents_->GetRenderProcessHost()->GetID());
 
   entry->GetSSL().security_style =
       content::SECURITY_STYLE_AUTHENTICATION_BROKEN;
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index bb8c345..5d762aa 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -661,11 +661,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestWSSClientCert) {
   base::FilePath cert_path = net::GetTestCertsDirectory().Append(
       FILE_PATH_LITERAL("websocket_client_cert.p12"));
   EXPECT_TRUE(file_util::ReadFileToString(cert_path, &pkcs12_data));
-  EXPECT_EQ(net::OK, cert_db->ImportFromPKCS12(crypt_module,
-                                               pkcs12_data,
-                                               string16(),
-                                               true,
-                                               NULL));
+  EXPECT_EQ(net::OK,
+            cert_db->ImportFromPKCS12(
+                crypt_module.get(), pkcs12_data, string16(), true, NULL));
 
   // Start WebSocket test server with TLS and client cert authentication.
   net::SpawnedTestServer::SSLOptions options(
diff --git a/chrome/browser/ssl/ssl_client_auth_observer.cc b/chrome/browser/ssl/ssl_client_auth_observer.cc
index 97c87e4..8e1d162 100644
--- a/chrome/browser/ssl/ssl_client_auth_observer.cc
+++ b/chrome/browser/ssl/ssl_client_auth_observer.cc
@@ -39,7 +39,7 @@ void SSLClientAuthObserver::CertificateSelected(
   StopObserving();
 
   CertDetails details;
-  details.first = cert_request_info_;
+  details.first = cert_request_info_.get();
   details.second = certificate;
   content::NotificationService* service =
       content::NotificationService::current();
diff --git a/chrome/browser/ssl/ssl_client_auth_observer.h b/chrome/browser/ssl/ssl_client_auth_observer.h
index 5d57780..1b0bb3d 100644
--- a/chrome/browser/ssl/ssl_client_auth_observer.h
+++ b/chrome/browser/ssl/ssl_client_auth_observer.h
@@ -43,7 +43,7 @@ class SSLClientAuthObserver : public content::NotificationObserver {
   void StopObserving();
 
   net::SSLCertRequestInfo* cert_request_info() const {
-    return cert_request_info_;
+    return cert_request_info_.get();
   }
 
  private:
diff --git a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc
index 57e994b..8ac9321 100644
--- a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc
+++ b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc
@@ -36,11 +36,11 @@ void SSLClientCertificateSelectorTestBase::SetUpInProcessBrowserTestFixture() {
   base::FilePath certs_dir = net::GetTestCertsDirectory();
 
   mit_davidben_cert_ = net::ImportCertFromFile(certs_dir, "mit.davidben.der");
-  ASSERT_TRUE(mit_davidben_cert_);
+  ASSERT_TRUE(mit_davidben_cert_.get());
 
   foaf_me_chromium_test_cert_ = net::ImportCertFromFile(
       certs_dir, "foaf.me.chromium-test-cert.der");
-  ASSERT_TRUE(foaf_me_chromium_test_cert_);
+  ASSERT_TRUE(foaf_me_chromium_test_cert_.get());
 
   cert_request_info_ = new net::SSLCertRequestInfo;
   cert_request_info_->host_and_port = "foo:123";
@@ -78,7 +78,7 @@ void SSLClientCertificateSelectorTestBase::CleanUpOnMainThread() {
 }
 
 void SSLClientCertificateSelectorTestBase::SetUpOnIOThread() {
-  url_request_ = MakeURLRequest(url_request_context_getter_);
+  url_request_ = MakeURLRequest(url_request_context_getter_.get());
 
   auth_requestor_ = new StrictMock<SSLClientAuthRequestorMock>(
       url_request_,
diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc
index 271d525..21de934 100644
--- a/chrome/browser/ssl/ssl_error_info.cc
+++ b/chrome/browser/ssl/ssl_error_info.cc
@@ -284,7 +284,8 @@ int SSLErrorInfo::GetErrorsForCertStatus(int cert_id,
         DCHECK(r);
       }
       if (errors)
-        errors->push_back(SSLErrorInfo::CreateError(kErrorTypes[i], cert, url));
+        errors->push_back(
+            SSLErrorInfo::CreateError(kErrorTypes[i], cert.get(), url));
     }
   }
   return count;
diff --git a/chrome/browser/ssl/ssl_tab_helper.cc b/chrome/browser/ssl/ssl_tab_helper.cc
index 1bb83d4..d444a37 100644
--- a/chrome/browser/ssl/ssl_tab_helper.cc
+++ b/chrome/browser/ssl/ssl_tab_helper.cc
@@ -120,10 +120,9 @@ string16 SSLCertResultInfoBarDelegate::GetButtonLabel(
 }
 
 bool SSLCertResultInfoBarDelegate::Accept() {
-  ShowCertificateViewer(
-      web_contents(),
-      web_contents()->GetView()->GetTopLevelNativeWindow(),
-      cert_);
+  ShowCertificateViewer(web_contents(),
+                        web_contents()->GetView()->GetTopLevelNativeWindow(),
+                        cert_.get());
   return false;  // Hiding the infobar just as the dialog opens looks weird.
 }
 
@@ -217,7 +216,7 @@ void SSLTabHelper::ShowClientCertificateRequestDialog(
 
 void SSLTabHelper::OnVerifyClientCertificateError(
     scoped_refptr<SSLAddCertHandler> handler, int error_code) {
-  SSLAddCertData* add_cert_data = GetAddCertData(handler);
+  SSLAddCertData* add_cert_data = GetAddCertData(handler.get());
   // Display an infobar with the error message.
   // TODO(davidben): Display a more user-friendly error string.
   add_cert_data->ShowInfoBar(
@@ -234,7 +233,7 @@ void SSLTabHelper::AskToAddClientCertificate(
 
 void SSLTabHelper::OnAddClientCertificateSuccess(
     scoped_refptr<SSLAddCertHandler> handler) {
-  SSLAddCertData* add_cert_data = GetAddCertData(handler);
+  SSLAddCertData* add_cert_data = GetAddCertData(handler.get());
   // Display an infobar to inform the user.
   net::X509Certificate* cert = handler->cert();
   // TODO(evanm): GetDisplayName should return UTF-16.
@@ -246,7 +245,7 @@ void SSLTabHelper::OnAddClientCertificateSuccess(
 
 void SSLTabHelper::OnAddClientCertificateError(
     scoped_refptr<SSLAddCertHandler> handler, int error_code) {
-  SSLAddCertData* add_cert_data = GetAddCertData(handler);
+  SSLAddCertData* add_cert_data = GetAddCertData(handler.get());
   // Display an infobar with the error message.
   // TODO(davidben): Display a more user-friendly error string.
   add_cert_data->ShowInfoBar(
diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.cc b/chrome/browser/sync/glue/autofill_data_type_controller.cc
index f86e3ab..20f0c7b 100644
--- a/chrome/browser/sync/glue/autofill_data_type_controller.cc
+++ b/chrome/browser/sync/glue/autofill_data_type_controller.cc
@@ -40,7 +40,7 @@ void AutofillDataTypeController::WebDatabaseLoaded() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(MODEL_STARTING, state());
 
-  if (web_data_service_)
+  if (web_data_service_.get())
     web_data_service_->RemoveDBObserver(this);
 
   OnModelLoaded();
@@ -48,7 +48,7 @@ void AutofillDataTypeController::WebDatabaseLoaded() {
 
 AutofillDataTypeController::~AutofillDataTypeController() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (web_data_service_)
+  if (web_data_service_.get())
     web_data_service_->RemoveDBObserver(this);
 }
 
@@ -68,7 +68,7 @@ bool AutofillDataTypeController::StartModels() {
   if (web_data_service_->IsDatabaseLoaded()) {
     return true;
   } else {
-    if (web_data_service_)
+    if (web_data_service_.get())
       web_data_service_->AddDBObserver(this);
     return false;
   }
@@ -78,7 +78,7 @@ void AutofillDataTypeController::StopModels() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(state() == STOPPING || state() == NOT_RUNNING || state() == DISABLED);
   DVLOG(1) << "AutofillDataTypeController::StopModels() : State = " << state();
-  if (web_data_service_)
+  if (web_data_service_.get())
     web_data_service_->RemoveDBObserver(this);
 }
 
@@ -106,7 +106,7 @@ void AutofillDataTypeController::UpdateAutofillCullingSettings(
     bool cull_expired_entries) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   AutocompleteSyncableService* service =
-      AutocompleteSyncableService::FromWebDataService(web_data_service_);
+      AutocompleteSyncableService::FromWebDataService(web_data_service_.get());
   if (!service) {
     DVLOG(1) << "Can't update culling, no AutocompleteSyncableService.";
     return;
diff --git a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
index 44fb7e6..1f72386 100644
--- a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
@@ -243,7 +243,7 @@ TEST_F(SyncAutofillDataTypeControllerTest, StartWDSReady) {
     base::Bind(&SyncAutofillDataTypeControllerTest::OnLoadFinished,
                weak_ptr_factory_.GetWeakPtr()));
 
-  EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_))
+  EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
       .WillOnce(Return(base::WeakPtr<syncer::SyncableService>()));
   autofill_dtc_->StartAssociating(
       base::Bind(&SyncAutofillDataTypeControllerTest::OnStartFinished,
@@ -273,7 +273,7 @@ TEST_F(SyncAutofillDataTypeControllerTest, StartWDSNotReady) {
         AutofillWebDataService::FromBrowserContext(&profile_).get());
   web_db->LoadDatabase();
 
-  EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_))
+  EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
       .WillOnce(Return(base::WeakPtr<syncer::SyncableService>()));
   autofill_dtc_->StartAssociating(
       base::Bind(&SyncAutofillDataTypeControllerTest::OnStartFinished,
@@ -305,7 +305,7 @@ TEST_F(SyncAutofillDataTypeControllerTest, UpdateAutofillCullingSettings) {
 
   EXPECT_FALSE(web_db->CheckAutofillCullingValue());
 
-  EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_))
+  EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
       .WillOnce(Return(base::WeakPtr<syncer::SyncableService>()));
   autofill_dtc_->StartAssociating(
       base::Bind(&SyncAutofillDataTypeControllerTest::OnStartFinished,
diff --git a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc
index d9069e5..479fe764 100644
--- a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc
+++ b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc
@@ -41,7 +41,7 @@ syncer::ModelSafeGroup
 
 void AutofillProfileDataTypeController::WebDatabaseLoaded() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (web_data_service_)
+  if (web_data_service_.get())
     web_data_service_->RemoveDBObserver(this);
   OnModelLoaded();
 }
@@ -53,7 +53,7 @@ void AutofillProfileDataTypeController::OnPersonalDataChanged() {
   personal_data_->RemoveObserver(this);
   web_data_service_ = AutofillWebDataService::FromBrowserContext(profile());
 
-  if (!web_data_service_)
+  if (!web_data_service_.get())
     return;
 
   if (web_data_service_->IsDatabaseLoaded())
@@ -86,7 +86,7 @@ bool AutofillProfileDataTypeController::StartModels() {
 
   web_data_service_ = AutofillWebDataService::FromBrowserContext(profile());
 
-  if (!web_data_service_)
+  if (!web_data_service_.get())
     return false;
 
   if (web_data_service_->IsDatabaseLoaded())
@@ -100,7 +100,7 @@ void AutofillProfileDataTypeController::StopModels() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(state() == STOPPING || state() == NOT_RUNNING);
 
-  if (web_data_service_)
+  if (web_data_service_.get())
     web_data_service_->RemoveDBObserver(this);
 
   personal_data_->RemoveObserver(this);
diff --git a/chrome/browser/sync/glue/favicon_cache.cc b/chrome/browser/sync/glue/favicon_cache.cc
index 3193791..4111f32 100644
--- a/chrome/browser/sync/glue/favicon_cache.cc
+++ b/chrome/browser/sync/glue/favicon_cache.cc
@@ -138,7 +138,7 @@ chrome::FaviconBitmapResult GetImageDataFromSpecifics(
 void FillSpecificsWithImageData(
     const chrome::FaviconBitmapResult& bitmap_result,
     sync_pb::FaviconData* favicon_data) {
-  if (!bitmap_result.bitmap_data)
+  if (!bitmap_result.bitmap_data.get())
     return;
   favicon_data->set_height(bitmap_result.pixel_size.height());
   favicon_data->set_width(bitmap_result.pixel_size.width());
@@ -500,7 +500,7 @@ bool FaviconCache::GetSyncedFaviconForFaviconURL(
     return false;
 
   // TODO(zea): support getting other resolutions.
-  if (!iter->second->bitmap_data[SIZE_16].bitmap_data)
+  if (!iter->second->bitmap_data[SIZE_16].bitmap_data.get())
     return false;
 
   *favicon_png = iter->second->bitmap_data[SIZE_16].bitmap_data;
@@ -844,19 +844,19 @@ void FaviconCache::MergeSyncFavicon(const syncer::SyncData& sync_favicon,
     if (image_specifics.has_favicon_web()) {
       favicon_info->bitmap_data[SIZE_16] = GetImageDataFromSpecifics(
           image_specifics.favicon_web());
-    } else if (favicon_info->bitmap_data[SIZE_16].bitmap_data) {
+    } else if (favicon_info->bitmap_data[SIZE_16].bitmap_data.get()) {
       needs_update = true;
     }
     if (image_specifics.has_favicon_web_32()) {
       favicon_info->bitmap_data[SIZE_32] = GetImageDataFromSpecifics(
           image_specifics.favicon_web_32());
-    } else if (favicon_info->bitmap_data[SIZE_32].bitmap_data) {
+    } else if (favicon_info->bitmap_data[SIZE_32].bitmap_data.get()) {
       needs_update = true;
     }
     if (image_specifics.has_favicon_touch_64()) {
       favicon_info->bitmap_data[SIZE_64] = GetImageDataFromSpecifics(
           image_specifics.favicon_touch_64());
-    } else if (favicon_info->bitmap_data[SIZE_64].bitmap_data) {
+    } else if (favicon_info->bitmap_data[SIZE_64].bitmap_data.get()) {
       needs_update = true;
     }
 
diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc
index 981e848..c9422a3 100644
--- a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc
@@ -99,7 +99,7 @@ class SyncFrontendDataTypeControllerTest : public testing::Test {
 
  protected:
   void SetStartExpectations() {
-    EXPECT_CALL(*dtc_mock_, StartModels()).WillOnce(Return(true));
+    EXPECT_CALL(*dtc_mock_.get(), StartModels()).WillOnce(Return(true));
     EXPECT_CALL(model_load_callback_, Run(_, _));
     model_associator_ = new ModelAssociatorMock();
     change_processor_ = new ChangeProcessorMock();
@@ -115,7 +115,7 @@ class SyncFrontendDataTypeControllerTest : public testing::Test {
         WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
     EXPECT_CALL(*model_associator_, AssociateModels(_, _)).
         WillOnce(Return(syncer::SyncError()));
-    EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+    EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   }
 
   void SetActivateExpectations(DataTypeController::StartResult result) {
@@ -124,7 +124,7 @@ class SyncFrontendDataTypeControllerTest : public testing::Test {
   }
 
   void SetStopExpectations() {
-    EXPECT_CALL(*dtc_mock_, CleanUpState());
+    EXPECT_CALL(*dtc_mock_.get(), CleanUpState());
     EXPECT_CALL(service_, DeactivateDataType(_));
     EXPECT_CALL(*model_associator_, DisassociateModels()).
                 WillOnce(Return(syncer::SyncError()));
@@ -132,9 +132,9 @@ class SyncFrontendDataTypeControllerTest : public testing::Test {
 
   void SetStartFailExpectations(DataTypeController::StartResult result) {
     if (DataTypeController::IsUnrecoverableResult(result))
-      EXPECT_CALL(*dtc_mock_, RecordUnrecoverableError(_, _));
-    EXPECT_CALL(*dtc_mock_, CleanUpState());
-    EXPECT_CALL(*dtc_mock_, RecordStartFailure(result));
+      EXPECT_CALL(*dtc_mock_.get(), RecordUnrecoverableError(_, _));
+    EXPECT_CALL(*dtc_mock_.get(), CleanUpState());
+    EXPECT_CALL(*dtc_mock_.get(), RecordStartFailure(result));
     EXPECT_CALL(start_callback_, Run(result, _, _));
   }
 
@@ -181,7 +181,7 @@ TEST_F(SyncFrontendDataTypeControllerTest, StartFirstRun) {
       WillOnce(DoAll(SetArgumentPointee<0>(false), Return(true)));
   EXPECT_CALL(*model_associator_, AssociateModels(_, _)).
       WillOnce(Return(syncer::SyncError()));
-  EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+  EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   SetActivateExpectations(DataTypeController::OK_FIRST_RUN);
   EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state());
   Start();
@@ -189,8 +189,8 @@ TEST_F(SyncFrontendDataTypeControllerTest, StartFirstRun) {
 }
 
 TEST_F(SyncFrontendDataTypeControllerTest, AbortDuringStartModels) {
-  EXPECT_CALL(*dtc_mock_, StartModels()).WillOnce(Return(false));
-  EXPECT_CALL(*dtc_mock_, CleanUpState());
+  EXPECT_CALL(*dtc_mock_.get(), StartModels()).WillOnce(Return(false));
+  EXPECT_CALL(*dtc_mock_.get(), CleanUpState());
   EXPECT_CALL(model_load_callback_, Run(_, _));
   EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state());
   frontend_dtc_->LoadModels(
@@ -212,7 +212,7 @@ TEST_F(SyncFrontendDataTypeControllerTest, StartAssociationFailed) {
                                 "error",
                                 syncer::BOOKMARKS)));
 
-  EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+  EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   SetStartFailExpectations(DataTypeController::ASSOCIATION_FAILED);
   // Set up association to fail with an association failed error.
   EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state());
@@ -261,10 +261,10 @@ TEST_F(SyncFrontendDataTypeControllerTest, OnSingleDatatypeUnrecoverableError) {
   SetStartExpectations();
   SetAssociateExpectations();
   SetActivateExpectations(DataTypeController::OK);
-  EXPECT_CALL(*dtc_mock_, RecordUnrecoverableError(_, "Test"));
-  EXPECT_CALL(service_, DisableBrokenDatatype(_,_,_)).
-      WillOnce(InvokeWithoutArgs(frontend_dtc_.get(),
-                                 &FrontendDataTypeController::Stop));
+  EXPECT_CALL(*dtc_mock_.get(), RecordUnrecoverableError(_, "Test"));
+  EXPECT_CALL(service_, DisableBrokenDatatype(_, _, _))
+      .WillOnce(InvokeWithoutArgs(frontend_dtc_.get(),
+                                  &FrontendDataTypeController::Stop));
   SetStopExpectations();
   EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state());
   Start();
diff --git a/chrome/browser/sync/glue/model_association_manager.cc b/chrome/browser/sync/glue/model_association_manager.cc
index 43016d3..632b58f 100644
--- a/chrome/browser/sync/glue/model_association_manager.cc
+++ b/chrome/browser/sync/glue/model_association_manager.cc
@@ -167,12 +167,12 @@ void ModelAssociationManager::Initialize(syncer::ModelTypeSet desired_types) {
   // currently MODEL_STARTING, ASSOCIATING, RUNNING or DISABLED.
   for (DataTypeController::TypeMap::const_iterator it = controllers_->begin();
        it != controllers_->end(); ++it) {
-    DataTypeController* dtc = (*it).second;
-    if (!desired_types.Has(dtc->type()) && (
-            dtc->state() == DataTypeController::MODEL_STARTING ||
-            dtc->state() == DataTypeController::ASSOCIATING ||
-            dtc->state() == DataTypeController::RUNNING ||
-            dtc->state() == DataTypeController::DISABLED)) {
+    DataTypeController* dtc = (*it).second.get();
+    if (!desired_types.Has(dtc->type()) &&
+        (dtc->state() == DataTypeController::MODEL_STARTING ||
+         dtc->state() == DataTypeController::ASSOCIATING ||
+         dtc->state() == DataTypeController::RUNNING ||
+         dtc->state() == DataTypeController::DISABLED)) {
       needs_stop_.push_back(dtc);
       DVLOG(1) << "ModelTypeToString: Will stop " << dtc->name();
     }
@@ -254,7 +254,7 @@ void ModelAssociationManager::Stop() {
          state_ == INITIALIZED_TO_CONFIGURE);
   for (DataTypeController::TypeMap::const_iterator it = controllers_->begin();
        it != controllers_->end(); ++it) {
-    DataTypeController* dtc = (*it).second;
+    DataTypeController* dtc = (*it).second.get();
     if (dtc->state() != DataTypeController::NOT_RUNNING &&
         dtc->state() != DataTypeController::STOPPING) {
       dtc->Stop();
diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
index 91cd8bb..fa64025 100644
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc
@@ -135,7 +135,7 @@ class SyncNonFrontendDataTypeControllerTest : public testing::Test {
 
  protected:
   void SetStartExpectations() {
-    EXPECT_CALL(*dtc_mock_, StartModels()).WillOnce(Return(true));
+    EXPECT_CALL(*dtc_mock_.get(), StartModels()).WillOnce(Return(true));
     EXPECT_CALL(model_load_callback_, Run(_, _));
     model_associator_ = new ModelAssociatorMock();
     change_processor_ = new ChangeProcessorMock();
@@ -151,7 +151,7 @@ class SyncNonFrontendDataTypeControllerTest : public testing::Test {
         WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
     EXPECT_CALL(*model_associator_, AssociateModels(_, _)).
         WillOnce(Return(syncer::SyncError()));
-    EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+    EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   }
 
   void SetActivateExpectations(DataTypeController::StartResult result) {
@@ -160,21 +160,21 @@ class SyncNonFrontendDataTypeControllerTest : public testing::Test {
   }
 
   void SetStopExpectations() {
-    EXPECT_CALL(*dtc_mock_, StopModels());
+    EXPECT_CALL(*dtc_mock_.get(), StopModels());
     EXPECT_CALL(service_, DeactivateDataType(_));
     EXPECT_CALL(*model_associator_, DisassociateModels()).
                 WillOnce(Return(syncer::SyncError()));
   }
 
   void SetStartFailExpectations(DataTypeController::StartResult result) {
-    EXPECT_CALL(*dtc_mock_, StopModels());
+    EXPECT_CALL(*dtc_mock_.get(), StopModels());
     if (DataTypeController::IsUnrecoverableResult(result))
-      EXPECT_CALL(*dtc_mock_, RecordUnrecoverableError(_, _));
+      EXPECT_CALL(*dtc_mock_.get(), RecordUnrecoverableError(_, _));
     if (model_associator_) {
       EXPECT_CALL(*model_associator_, DisassociateModels()).
                   WillOnce(Return(syncer::SyncError()));
     }
-    EXPECT_CALL(*dtc_mock_, RecordStartFailure(result));
+    EXPECT_CALL(*dtc_mock_.get(), RecordStartFailure(result));
     EXPECT_CALL(start_callback_, Run(result, _, _));
   }
 
@@ -234,7 +234,7 @@ TEST_F(SyncNonFrontendDataTypeControllerTest, StartFirstRun) {
       WillOnce(DoAll(SetArgumentPointee<0>(false), Return(true)));
   EXPECT_CALL(*model_associator_, AssociateModels(_, _)).
       WillOnce(Return(syncer::SyncError()));
-  EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+  EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   SetActivateExpectations(DataTypeController::OK_FIRST_RUN);
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_frontend_dtc_->state());
   Start();
@@ -251,7 +251,7 @@ TEST_F(SyncNonFrontendDataTypeControllerTest, StartAssociationFailed) {
   EXPECT_CALL(*model_associator_, AssociateModels(_, _)).
       WillOnce(
           Return(syncer::SyncError(FROM_HERE, "Error", syncer::BOOKMARKS)));
-  EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+  EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   SetStartFailExpectations(DataTypeController::ASSOCIATION_FAILED);
   // Set up association to fail with an association failed error.
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_frontend_dtc_->state());
@@ -306,10 +306,11 @@ TEST_F(SyncNonFrontendDataTypeControllerTest, AbortDuringAssociationInactive) {
       SignalEvent(&pause_db_thread));
   EXPECT_CALL(*model_associator_, AssociateModels(_, _)).
               WillOnce(Return(syncer::SyncError()));
-  EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+  EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   EXPECT_CALL(service_, ActivateDataType(_, _, _));
   EXPECT_CALL(start_callback_, Run(DataTypeController::ABORTED,_,_));
-  EXPECT_CALL(*dtc_mock_, RecordStartFailure(DataTypeController::ABORTED));
+  EXPECT_CALL(*dtc_mock_.get(),
+              RecordStartFailure(DataTypeController::ABORTED));
   SetStopExpectations();
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_frontend_dtc_->state());
   Start();
@@ -335,12 +336,12 @@ TEST_F(SyncNonFrontendDataTypeControllerTest, AbortDuringAssociationActivated) {
       SignalEvent(&pause_db_thread));
   EXPECT_CALL(*model_associator_, AssociateModels(_, _)).
       WillOnce(Return(syncer::SyncError()));
-  EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+  EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   EXPECT_CALL(service_, ActivateDataType(_, _, _)).WillOnce(DoAll(
-      SignalEvent(&wait_for_db_thread_pause),
-      WaitOnEvent(&pause_db_thread)));
+      SignalEvent(&wait_for_db_thread_pause), WaitOnEvent(&pause_db_thread)));
   EXPECT_CALL(start_callback_, Run(DataTypeController::ABORTED,_,_));
-  EXPECT_CALL(*dtc_mock_, RecordStartFailure(DataTypeController::ABORTED));
+  EXPECT_CALL(*dtc_mock_.get(),
+              RecordStartFailure(DataTypeController::ABORTED));
   SetStopExpectations();
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_frontend_dtc_->state());
   Start();
@@ -368,10 +369,10 @@ TEST_F(SyncNonFrontendDataTypeControllerTest,
   SetStartExpectations();
   SetAssociateExpectations();
   SetActivateExpectations(DataTypeController::OK);
-  EXPECT_CALL(*dtc_mock_, RecordUnrecoverableError(_, "Test"));
-  EXPECT_CALL(service_, DisableBrokenDatatype(_,_,_)).WillOnce(
-      InvokeWithoutArgs(non_frontend_dtc_.get(),
-          &NonFrontendDataTypeController::Stop));
+  EXPECT_CALL(*dtc_mock_.get(), RecordUnrecoverableError(_, "Test"));
+  EXPECT_CALL(service_, DisableBrokenDatatype(_, _, _))
+      .WillOnce(InvokeWithoutArgs(non_frontend_dtc_.get(),
+                                  &NonFrontendDataTypeController::Stop));
   SetStopExpectations();
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_frontend_dtc_->state());
   Start();
diff --git a/chrome/browser/sync/glue/non_ui_data_type_controller.cc b/chrome/browser/sync/glue/non_ui_data_type_controller.cc
index a1a476d..860ea10 100644
--- a/chrome/browser/sync/glue/non_ui_data_type_controller.cc
+++ b/chrome/browser/sync/glue/non_ui_data_type_controller.cc
@@ -398,7 +398,7 @@ void NonUIDataTypeController::ClearSharedChangeProcessor() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // |shared_change_processor_| can already be NULL if Stop() is
   // called after StartDoneImpl(_, DISABLED, _).
-  if (shared_change_processor_) {
+  if (shared_change_processor_.get()) {
     shared_change_processor_->Disconnect();
     shared_change_processor_ = NULL;
   }
diff --git a/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
index 4be7a1b..43107da 100644
--- a/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
@@ -189,7 +189,7 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
 
  protected:
   void SetStartExpectations() {
-    EXPECT_CALL(*dtc_mock_, StartModels()).WillOnce(Return(true));
+    EXPECT_CALL(*dtc_mock_.get(), StartModels()).WillOnce(Return(true));
     EXPECT_CALL(model_load_callback_, Run(_, _));
     EXPECT_CALL(*profile_sync_factory_,
                 CreateSharedChangeProcessor()).
@@ -197,17 +197,17 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
   }
 
   void SetAssociateExpectations() {
-    EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
-        WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
-    EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
-        WillOnce(Return(true));
-    EXPECT_CALL(*change_processor_, ActivateDataType(_));
-    EXPECT_CALL(*change_processor_, SyncModelHasUserCreatedNodes(_)).
-        WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
-    EXPECT_CALL(*change_processor_, GetSyncData(_)).
-        WillOnce(Return(syncer::SyncError()));
-    EXPECT_CALL(*change_processor_, GetSyncCount()).WillOnce(Return(0));
-    EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+    EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+        .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+    EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+        .WillOnce(Return(true));
+    EXPECT_CALL(*change_processor_.get(), ActivateDataType(_));
+    EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
+        .WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
+    EXPECT_CALL(*change_processor_.get(), GetSyncData(_))
+        .WillOnce(Return(syncer::SyncError()));
+    EXPECT_CALL(*change_processor_.get(), GetSyncCount()).WillOnce(Return(0));
+    EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   }
 
   void SetActivateExpectations(DataTypeController::StartResult result) {
@@ -215,17 +215,17 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
   }
 
   void SetStopExpectations() {
-    EXPECT_CALL(*dtc_mock_, StopModels());
-    EXPECT_CALL(*change_processor_, Disconnect()).WillOnce(Return(true));
+    EXPECT_CALL(*dtc_mock_.get(), StopModels());
+    EXPECT_CALL(*change_processor_.get(), Disconnect()).WillOnce(Return(true));
     EXPECT_CALL(service_, DeactivateDataType(_));
   }
 
   void SetStartFailExpectations(DataTypeController::StartResult result) {
-    EXPECT_CALL(*dtc_mock_, StopModels()).Times(AtLeast(1));
+    EXPECT_CALL(*dtc_mock_.get(), StopModels()).Times(AtLeast(1));
     if (DataTypeController::IsUnrecoverableResult(result))
-      EXPECT_CALL(*dtc_mock_, RecordUnrecoverableError(_, _));
-    EXPECT_CALL(*dtc_mock_, RecordStartFailure(result));
-    EXPECT_CALL(start_callback_, Run(result,_,_));
+      EXPECT_CALL(*dtc_mock_.get(), RecordUnrecoverableError(_, _));
+    EXPECT_CALL(*dtc_mock_.get(), RecordStartFailure(result));
+    EXPECT_CALL(start_callback_, Run(result, _, _));
   }
 
   void Start() {
@@ -269,15 +269,15 @@ TEST_F(SyncNonUIDataTypeControllerTest, StartOk) {
 
 TEST_F(SyncNonUIDataTypeControllerTest, StartFirstRun) {
   SetStartExpectations();
-  EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
-      WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
-  EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
-      WillOnce(Return(true));
-  EXPECT_CALL(*change_processor_, SyncModelHasUserCreatedNodes(_)).
-      WillOnce(DoAll(SetArgumentPointee<0>(false), Return(true)));
-  EXPECT_CALL(*change_processor_, GetSyncData(_)).
-      WillOnce(Return(syncer::SyncError()));
-  EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+  EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+      .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+  EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+      .WillOnce(Return(true));
+  EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
+      .WillOnce(DoAll(SetArgumentPointee<0>(false), Return(true)));
+  EXPECT_CALL(*change_processor_.get(), GetSyncData(_))
+      .WillOnce(Return(syncer::SyncError()));
+  EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   SetActivateExpectations(DataTypeController::OK_FIRST_RUN);
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
   Start();
@@ -291,8 +291,8 @@ TEST_F(SyncNonUIDataTypeControllerTest, AbortDuringStartModels) {
   EXPECT_CALL(*profile_sync_factory_,
               CreateSharedChangeProcessor()).
       WillOnce(Return(change_processor_.get()));
-  EXPECT_CALL(*dtc_mock_, StartModels()).WillOnce(Return(false));
-  EXPECT_CALL(*dtc_mock_, StopModels());
+  EXPECT_CALL(*dtc_mock_.get(), StartModels()).WillOnce(Return(false));
+  EXPECT_CALL(*dtc_mock_.get(), StopModels());
   EXPECT_CALL(model_load_callback_, Run(_, _));
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
   non_ui_dtc_->LoadModels(
@@ -309,15 +309,15 @@ TEST_F(SyncNonUIDataTypeControllerTest, AbortDuringStartModels) {
 // cleanly.
 TEST_F(SyncNonUIDataTypeControllerTest, StartAssociationFailed) {
   SetStartExpectations();
-  EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
-      WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
-  EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
-      WillOnce(Return(true));
-  EXPECT_CALL(*change_processor_, SyncModelHasUserCreatedNodes(_)).
-      WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
-  EXPECT_CALL(*change_processor_, GetSyncData(_)).
-      WillOnce(Return(syncer::SyncError()));
-  EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));
+  EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+      .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+  EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+      .WillOnce(Return(true));
+  EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
+      .WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
+  EXPECT_CALL(*change_processor_.get(), GetSyncData(_))
+      .WillOnce(Return(syncer::SyncError()));
+  EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
   SetStartFailExpectations(DataTypeController::ASSOCIATION_FAILED);
   // Set up association to fail with an association failed error.
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
@@ -336,12 +336,12 @@ TEST_F(SyncNonUIDataTypeControllerTest,
   SetStartExpectations();
   SetStartFailExpectations(DataTypeController::UNRECOVERABLE_ERROR);
   // Set up association to fail with an unrecoverable error.
-  EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
-      WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
-  EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
-      WillRepeatedly(Return(true));
-  EXPECT_CALL(*change_processor_, SyncModelHasUserCreatedNodes(_)).
-      WillRepeatedly(DoAll(SetArgumentPointee<0>(false), Return(false)));
+  EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+      .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+  EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+      .WillRepeatedly(Return(true));
+  EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
+      .WillRepeatedly(DoAll(SetArgumentPointee<0>(false), Return(false)));
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
   Start();
   WaitForDTC();
@@ -353,10 +353,10 @@ TEST_F(SyncNonUIDataTypeControllerTest,
   SetStartExpectations();
   SetStartFailExpectations(DataTypeController::NEEDS_CRYPTO);
   // Set up association to fail with a NEEDS_CRYPTO error.
-  EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
-      WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
-  EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
-      WillRepeatedly(Return(false));
+  EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+      .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+  EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+      .WillRepeatedly(Return(false));
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
   Start();
   WaitForDTC();
@@ -371,22 +371,19 @@ TEST_F(SyncNonUIDataTypeControllerTest, AbortDuringAssociation) {
 
   SetStartExpectations();
   SetStartFailExpectations(DataTypeController::ABORTED);
-  EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
-      WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
-  EXPECT_CALL(*change_processor_, CryptoReadyIfNecessary()).
-      WillOnce(Return(true));
-  EXPECT_CALL(*change_processor_, SyncModelHasUserCreatedNodes(_)).
-      WillOnce(DoAll(
-          SignalEvent(&wait_for_db_thread_pause),
-          WaitOnEvent(&pause_db_thread),
-          SetArgumentPointee<0>(true),
-          Return(true)));
-  EXPECT_CALL(*change_processor_, GetSyncData(_)).
-      WillOnce(
-          Return(
-              syncer::SyncError(FROM_HERE, "Disconnected.", AUTOFILL_PROFILE)));
-  EXPECT_CALL(*change_processor_, Disconnect()).
-      WillOnce(DoAll(SignalEvent(&pause_db_thread), Return(true)));
+  EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+      .WillOnce(GetWeakPtrToSyncableService(&syncable_service_));
+  EXPECT_CALL(*change_processor_.get(), CryptoReadyIfNecessary())
+      .WillOnce(Return(true));
+  EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
+      .WillOnce(DoAll(SignalEvent(&wait_for_db_thread_pause),
+                      WaitOnEvent(&pause_db_thread),
+                      SetArgumentPointee<0>(true),
+                      Return(true)));
+  EXPECT_CALL(*change_processor_.get(), GetSyncData(_)).WillOnce(
+      Return(syncer::SyncError(FROM_HERE, "Disconnected.", AUTOFILL_PROFILE)));
+  EXPECT_CALL(*change_processor_.get(), Disconnect())
+      .WillOnce(DoAll(SignalEvent(&pause_db_thread), Return(true)));
   EXPECT_CALL(service_, DeactivateDataType(_));
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
   Start();
@@ -405,10 +402,11 @@ TEST_F(SyncNonUIDataTypeControllerTest, StartAfterSyncShutdown) {
   SetStartExpectations();
   // We don't expect StopSyncing to be called because local_service_ will never
   // have been set.
-  EXPECT_CALL(*change_processor_, Disconnect()).WillOnce(Return(true));
-  EXPECT_CALL(*dtc_mock_, StopModels());
+  EXPECT_CALL(*change_processor_.get(), Disconnect()).WillOnce(Return(true));
+  EXPECT_CALL(*dtc_mock_.get(), StopModels());
   EXPECT_CALL(service_, DeactivateDataType(_));
-  EXPECT_CALL(*dtc_mock_, RecordStartFailure(DataTypeController::ABORTED));
+  EXPECT_CALL(*dtc_mock_.get(),
+              RecordStartFailure(DataTypeController::ABORTED));
   EXPECT_CALL(start_callback_, Run(DataTypeController::ABORTED, _, _));
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
   Start();
@@ -416,11 +414,11 @@ TEST_F(SyncNonUIDataTypeControllerTest, StartAfterSyncShutdown) {
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
   Mock::VerifyAndClearExpectations(&profile_sync_factory_);
   Mock::VerifyAndClearExpectations(&service_);
-  Mock::VerifyAndClearExpectations(change_processor_);
-  Mock::VerifyAndClearExpectations(dtc_mock_);
+  Mock::VerifyAndClearExpectations(change_processor_.get());
+  Mock::VerifyAndClearExpectations(dtc_mock_.get());
 
-  EXPECT_CALL(*change_processor_, Connect(_,_,_,_,_)).
-      WillOnce(Return(base::WeakPtr<syncer::SyncableService>()));
+  EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
+      .WillOnce(Return(base::WeakPtr<syncer::SyncableService>()));
   non_ui_dtc_->UnblockBackendTasks();
   WaitForDTC();
 }
@@ -471,10 +469,9 @@ TEST_F(SyncNonUIDataTypeControllerTest,
   SetStartExpectations();
   SetAssociateExpectations();
   SetActivateExpectations(DataTypeController::OK);
-  EXPECT_CALL(*dtc_mock_, RecordUnrecoverableError(_, "Test"));
-  EXPECT_CALL(service_, DisableBrokenDatatype(_,_,_)).WillOnce(
-      InvokeWithoutArgs(non_ui_dtc_.get(),
-                        &NonUIDataTypeController::Stop));
+  EXPECT_CALL(*dtc_mock_.get(), RecordUnrecoverableError(_, "Test"));
+  EXPECT_CALL(service_, DisableBrokenDatatype(_, _, _)).WillOnce(
+      InvokeWithoutArgs(non_ui_dtc_.get(), &NonUIDataTypeController::Stop));
   SetStopExpectations();
   EXPECT_EQ(DataTypeController::NOT_RUNNING, non_ui_dtc_->state());
   Start();
diff --git a/chrome/browser/sync/glue/password_model_worker.cc b/chrome/browser/sync/glue/password_model_worker.cc
index ae5ac5c..a3a3037 100644
--- a/chrome/browser/sync/glue/password_model_worker.cc
+++ b/chrome/browser/sync/glue/password_model_worker.cc
@@ -18,7 +18,7 @@ PasswordModelWorker::PasswordModelWorker(
     syncer::WorkerLoopDestructionObserver* observer)
   : syncer::ModelSafeWorker(observer),
     password_store_(password_store) {
-  DCHECK(password_store);
+  DCHECK(password_store.get());
 }
 
 void PasswordModelWorker::RegisterForLoopDestruction() {
diff --git a/chrome/browser/sync/glue/shared_change_processor.cc b/chrome/browser/sync/glue/shared_change_processor.cc
index aaf8518..f0c5309 100644
--- a/chrome/browser/sync/glue/shared_change_processor.cc
+++ b/chrome/browser/sync/glue/shared_change_processor.cc
@@ -31,7 +31,7 @@ SharedChangeProcessor::~SharedChangeProcessor() {
   // thread).  |generic_change_processor_|, if non-NULL, must be
   // deleted on |backend_loop_|.
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    if (backend_loop_) {
+    if (backend_loop_.get()) {
       if (!backend_loop_->DeleteSoon(FROM_HERE, generic_change_processor_)) {
         NOTREACHED();
       }
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index badc896..23d9524 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -386,7 +386,7 @@ SyncBackendHost::SyncBackendHost(Profile* profile)
 }
 
 SyncBackendHost::~SyncBackendHost() {
-  DCHECK(!core_ && !frontend_) << "Must call Shutdown before destructor.";
+  DCHECK(!core_.get() && !frontend_) << "Must call Shutdown before destructor.";
   DCHECK(!android_invalidator_bridge_.get());
   DCHECK(!registrar_.get());
 }
@@ -399,7 +399,7 @@ scoped_ptr<syncer::HttpPostProviderFactory> MakeHttpBridgeFactory(
   chrome::VersionInfo version_info;
   return scoped_ptr<syncer::HttpPostProviderFactory>(
       new syncer::HttpBridgeFactory(
-          getter,
+          getter.get(),
           DeviceInfo::MakeUserAgentForSyncApi(version_info),
           update_callback));
 }
diff --git a/chrome/browser/sync/glue/sync_backend_registrar.cc b/chrome/browser/sync/glue/sync_backend_registrar.cc
index ba14d44..5d99b0d 100644
--- a/chrome/browser/sync/glue/sync_backend_registrar.cc
+++ b/chrome/browser/sync/glue/sync_backend_registrar.cc
@@ -79,9 +79,9 @@ SyncBackendRegistrar::SyncBackendRegistrar(
 
   scoped_refptr<PasswordStore> password_store =
       PasswordStoreFactory::GetForProfile(profile, Profile::IMPLICIT_ACCESS);
-  if (password_store) {
-    workers_[syncer::GROUP_PASSWORD] = new PasswordModelWorker(password_store,
-                                                               this);
+  if (password_store.get()) {
+    workers_[syncer::GROUP_PASSWORD] =
+        new PasswordModelWorker(password_store, this);
   }
 }
 
@@ -248,7 +248,7 @@ void SyncBackendRegistrar::GetWorkers(
   out->clear();
   for (WorkerMap::const_iterator it = workers_.begin();
        it != workers_.end(); ++it) {
-    out->push_back(it->second);
+    out->push_back(it->second.get());
   }
 }
 
diff --git a/chrome/browser/sync/glue/ui_data_type_controller.cc b/chrome/browser/sync/glue/ui_data_type_controller.cc
index d4f0d80..a3e5b61 100644
--- a/chrome/browser/sync/glue/ui_data_type_controller.cc
+++ b/chrome/browser/sync/glue/ui_data_type_controller.cc
@@ -201,7 +201,7 @@ void UIDataTypeController::AbortModelLoad() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   state_ = NOT_RUNNING;
 
-  if (shared_change_processor_) {
+  if (shared_change_processor_.get()) {
     shared_change_processor_ = NULL;
   }
 
@@ -230,7 +230,7 @@ void UIDataTypeController::StartDone(
     }
     RecordStartFailure(start_result);
 
-    if (shared_change_processor_) {
+    if (shared_change_processor_.get()) {
       shared_change_processor_->Disconnect();
       shared_change_processor_ = NULL;
     }
@@ -251,7 +251,7 @@ void UIDataTypeController::Stop() {
   State prev_state = state_;
   state_ = STOPPING;
 
-  if (shared_change_processor_) {
+  if (shared_change_processor_.get()) {
     shared_change_processor_->Disconnect();
     shared_change_processor_ = NULL;
   }
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 417f046..292ab3d 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -337,14 +337,14 @@ base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl::
           syncer::PRIORITY_PREFERENCES)->AsWeakPtr();
     case syncer::AUTOFILL:
     case syncer::AUTOFILL_PROFILE: {
-      if (!web_data_service_)
+      if (!web_data_service_.get())
         return base::WeakPtr<syncer::SyncableService>();
       if (type == syncer::AUTOFILL) {
         return AutocompleteSyncableService::FromWebDataService(
-            web_data_service_)->AsWeakPtr();
+            web_data_service_.get())->AsWeakPtr();
       } else {
         return AutofillProfileSyncableService::FromWebDataService(
-            web_data_service_)->AsWeakPtr();
+            web_data_service_.get())->AsWeakPtr();
       }
     }
     case syncer::APPS:
diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc
index a5fd446..e7d61ba 100644
--- a/chrome/browser/sync/profile_sync_service_password_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc
@@ -178,7 +178,7 @@ class ProfileSyncServicePasswordTest : public AbstractProfileSyncServiceTest {
   }
 
   virtual void TearDown() {
-    if (password_store_)
+    if (password_store_.get())
       password_store_->ShutdownOnUIThread();
       ProfileSyncServiceFactory::GetInstance()->SetTestingFactory(
           &profile_, NULL);
@@ -227,12 +227,11 @@ class ProfileSyncServicePasswordTest : public AbstractProfileSyncServiceTest {
                                          sync_service_);
       ProfileSyncComponentsFactoryMock* components =
           sync_service_->components_factory_mock();
-      if (password_store_) {
-        EXPECT_CALL(*components, CreatePasswordSyncComponents(_, _, _)).
-            Times(AtLeast(1)).  // Can be more if we hit NEEDS_CRYPTO.
-            WillRepeatedly(MakePasswordSyncComponents(sync_service_,
-                                                      password_store_.get(),
-                                                      data_type_controller));
+      if (password_store_.get()) {
+        EXPECT_CALL(*components, CreatePasswordSyncComponents(_, _, _))
+            .Times(AtLeast(1)).  // Can be more if we hit NEEDS_CRYPTO.
+            WillRepeatedly(MakePasswordSyncComponents(
+                sync_service_, password_store_.get(), data_type_controller));
       } else {
         // When the password store is unavailable, password sync components must
         // not be created.
@@ -320,9 +319,9 @@ class ProfileSyncServicePasswordTest : public AbstractProfileSyncServiceTest {
   }
 
   void SetIdleChangeProcessorExpectations() {
-    EXPECT_CALL(*password_store_, AddLoginImpl(_)).Times(0);
-    EXPECT_CALL(*password_store_, UpdateLoginImpl(_)).Times(0);
-    EXPECT_CALL(*password_store_, RemoveLoginImpl(_)).Times(0);
+    EXPECT_CALL(*password_store_.get(), AddLoginImpl(_)).Times(0);
+    EXPECT_CALL(*password_store_.get(), UpdateLoginImpl(_)).Times(0);
+    EXPECT_CALL(*password_store_.get(), RemoveLoginImpl(_)).Times(0);
   }
 
   content::MockNotificationObserver observer_;
@@ -377,9 +376,9 @@ TEST_F(ProfileSyncServicePasswordTest, MAYBE_FailPasswordStoreLoad) {
 }
 
 TEST_F(ProfileSyncServicePasswordTest, MAYBE_EmptyNativeEmptySync) {
-  EXPECT_CALL(*password_store_, FillAutofillableLogins(_))
+  EXPECT_CALL(*password_store_.get(), FillAutofillableLogins(_))
       .WillOnce(Return(true));
-  EXPECT_CALL(*password_store_, FillBlacklistLogins(_))
+  EXPECT_CALL(*password_store_.get(), FillBlacklistLogins(_))
       .WillOnce(Return(true));
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::PASSWORDS);
@@ -407,9 +406,9 @@ TEST_F(ProfileSyncServicePasswordTest, MAYBE_HasNativeEntriesEmptySync) {
   new_form->blacklisted_by_user = false;
   forms.push_back(new_form);
   expected_forms.push_back(*new_form);
-  EXPECT_CALL(*password_store_, FillAutofillableLogins(_))
+  EXPECT_CALL(*password_store_.get(), FillAutofillableLogins(_))
       .WillOnce(DoAll(SetArgumentPointee<0>(forms), Return(true)));
-  EXPECT_CALL(*password_store_, FillBlacklistLogins(_))
+  EXPECT_CALL(*password_store_.get(), FillBlacklistLogins(_))
       .WillOnce(Return(true));
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::PASSWORDS);
@@ -460,9 +459,9 @@ TEST_F(ProfileSyncServicePasswordTest,
     expected_forms.push_back(*new_form);
   }
 
-  EXPECT_CALL(*password_store_, FillAutofillableLogins(_))
+  EXPECT_CALL(*password_store_.get(), FillAutofillableLogins(_))
       .WillOnce(DoAll(SetArgumentPointee<0>(forms), Return(true)));
-  EXPECT_CALL(*password_store_, FillBlacklistLogins(_))
+  EXPECT_CALL(*password_store_.get(), FillBlacklistLogins(_))
       .WillOnce(Return(true));
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::PASSWORDS);
@@ -515,10 +514,11 @@ TEST_F(ProfileSyncServicePasswordTest, MAYBE_HasNativeHasSyncNoMerge) {
     expected_forms.push_back(new_form);
   }
 
-  EXPECT_CALL(*password_store_, FillAutofillableLogins(_))
+  EXPECT_CALL(*password_store_.get(), FillAutofillableLogins(_))
       .WillOnce(DoAll(SetArgumentPointee<0>(native_forms), Return(true)));
-  EXPECT_CALL(*password_store_, FillBlacklistLogins(_)).WillOnce(Return(true));
-  EXPECT_CALL(*password_store_, AddLoginImpl(_)).Times(1);
+  EXPECT_CALL(*password_store_.get(), FillBlacklistLogins(_))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*password_store_.get(), AddLoginImpl(_)).Times(1);
 
   CreateRootHelper create_root(this, syncer::PASSWORDS);
   StartSyncService(create_root.callback(),
@@ -575,14 +575,13 @@ TEST_F(ProfileSyncServicePasswordTest, MAYBE_EnsureNoTransactions) {
     expected_forms.push_back(new_form);
   }
 
-  EXPECT_CALL(*password_store_, FillAutofillableLogins(_))
+  EXPECT_CALL(*password_store_.get(), FillAutofillableLogins(_))
       .WillOnce(DoAll(SetArgumentPointee<0>(native_forms),
                       AcquireSyncTransaction(this),
                       Return(true)));
-  EXPECT_CALL(*password_store_, FillBlacklistLogins(_))
-      .WillOnce(DoAll(AcquireSyncTransaction(this),
-                      Return(true)));
-  EXPECT_CALL(*password_store_, AddLoginImpl(_))
+  EXPECT_CALL(*password_store_.get(), FillBlacklistLogins(_))
+      .WillOnce(DoAll(AcquireSyncTransaction(this), Return(true)));
+  EXPECT_CALL(*password_store_.get(), AddLoginImpl(_))
       .WillOnce(AcquireSyncTransaction(this));
 
   CreateRootHelper create_root(this, syncer::PASSWORDS);
@@ -653,10 +652,11 @@ TEST_F(ProfileSyncServicePasswordTest, MAYBE_HasNativeHasSyncMergeEntry) {
     expected_forms.push_back(new_form);
   }
 
-  EXPECT_CALL(*password_store_, FillAutofillableLogins(_))
+  EXPECT_CALL(*password_store_.get(), FillAutofillableLogins(_))
       .WillOnce(DoAll(SetArgumentPointee<0>(native_forms), Return(true)));
-  EXPECT_CALL(*password_store_, FillBlacklistLogins(_)).WillOnce(Return(true));
-  EXPECT_CALL(*password_store_, UpdateLoginImpl(_)).Times(1);
+  EXPECT_CALL(*password_store_.get(), FillBlacklistLogins(_))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*password_store_.get(), UpdateLoginImpl(_)).Times(1);
 
   CreateRootHelper create_root(this, syncer::PASSWORDS);
   StartSyncService(create_root.callback(),
diff --git a/chrome/browser/sync/test/integration/autofill_helper.cc b/chrome/browser/sync/test/integration/autofill_helper.cc
index e848a17..31f86e4 100644
--- a/chrome/browser/sync/test/integration/autofill_helper.cc
+++ b/chrome/browser/sync/test/integration/autofill_helper.cc
@@ -221,7 +221,7 @@ void RemoveKeys(int profile) {
 
 std::set<AutofillEntry> GetAllKeys(int profile) {
   scoped_refptr<AutofillWebDataService> wds = GetWebDataService(profile);
-  std::vector<AutofillEntry> all_entries = GetAllAutofillEntries(wds);
+  std::vector<AutofillEntry> all_entries = GetAllAutofillEntries(wds.get());
   std::set<AutofillEntry> all_keys;
   for (std::vector<AutofillEntry>::const_iterator it = all_entries.begin();
        it != all_entries.end(); ++it) {
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
index 7f8fcab..151020b 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -61,13 +61,15 @@ void SyncExtensionHelper::SetupIfNecessary(SyncTest* test) {
 std::string SyncExtensionHelper::InstallExtension(
     Profile* profile, const std::string& name, Manifest::Type type) {
   scoped_refptr<Extension> extension = GetExtension(profile, name, type);
-  if (!extension) {
+  if (!extension.get()) {
     NOTREACHED() << "Could not install extension " << name;
     return std::string();
   }
-  profile->GetExtensionService()->OnExtensionInstalled(
-      extension, syncer::StringOrdinal(), false /* no requirement errors */,
-      false /* don't wait for idle to install */);
+  profile->GetExtensionService()
+      ->OnExtensionInstalled(extension.get(),
+                             syncer::StringOrdinal(),
+                             false /* no requirement errors */,
+                             false /* don't wait for idle to install */);
   return extension->id();
 }
 
@@ -321,7 +323,7 @@ scoped_refptr<Extension> CreateExtension(const base::FilePath& base_dir,
     ADD_FAILURE() << error;
     return NULL;
   }
-  if (!extension) {
+  if (!extension.get()) {
     ADD_FAILURE();
     return NULL;
   }
@@ -357,7 +359,7 @@ scoped_refptr<Extension> SyncExtensionHelper::GetExtension(
   scoped_refptr<Extension> extension =
       CreateExtension(profile->GetExtensionService()->install_directory(),
                       name, type);
-  if (!extension) {
+  if (!extension.get()) {
     ADD_FAILURE();
     return NULL;
   }
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc b/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc
index e22b505..acbde2d 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc
@@ -113,7 +113,7 @@ scoped_refptr<const extensions::Extension> AddTestExtension(
             .Set("version", "1.0"))
           .SetID(id)
       .Build();
-  extension_service->AddExtension(extension);
+  extension_service->AddExtension(extension.get());
   return extension;
 }
 
diff --git a/chrome/browser/sync_file_system/drive_metadata_store.cc b/chrome/browser/sync_file_system/drive_metadata_store.cc
index 5aea454..89eb3aa 100644
--- a/chrome/browser/sync_file_system/drive_metadata_store.cc
+++ b/chrome/browser/sync_file_system/drive_metadata_store.cc
@@ -255,10 +255,13 @@ void DriveMetadataStore::Initialize(const InitializationCallback& callback) {
   DriveMetadataDBContents* contents = new DriveMetadataDBContents;
 
   base::PostTaskAndReplyWithResult(
-      file_task_runner_, FROM_HERE,
+      file_task_runner_.get(),
+      FROM_HERE,
       base::Bind(InitializeDBOnFileThread, db_.get(), contents),
-      base::Bind(&DriveMetadataStore::DidInitialize, AsWeakPtr(),
-                 callback, base::Owned(contents)));
+      base::Bind(&DriveMetadataStore::DidInitialize,
+                 AsWeakPtr(),
+                 callback,
+                 base::Owned(contents)));
 }
 
 void DriveMetadataStore::DidInitialize(const InitializationCallback& callback,
@@ -292,12 +295,14 @@ void DriveMetadataStore::RestoreSyncRootDirectory(
   DCHECK(CalledOnValidThread());
   std::string* sync_root_directory_resource_id = new std::string;
   base::PostTaskAndReplyWithResult(
-      file_task_runner_, FROM_HERE,
+      file_task_runner_.get(),
+      FROM_HERE,
       base::Bind(&DriveMetadataDB::GetSyncRootDirectory,
                  base::Unretained(db_.get()),
                  sync_root_directory_resource_id),
       base::Bind(&DriveMetadataStore::DidRestoreSyncRootDirectory,
-                 AsWeakPtr(), callback,
+                 AsWeakPtr(),
+                 callback,
                  base::Owned(sync_root_directory_resource_id)));
 }
 
@@ -324,13 +329,15 @@ void DriveMetadataStore::RestoreOrigins(
   ResourceIdByOrigin* incremental_sync_origins = new ResourceIdByOrigin;
   ResourceIdByOrigin* disabled_origins = new ResourceIdByOrigin;
   base::PostTaskAndReplyWithResult(
-      file_task_runner_, FROM_HERE,
+      file_task_runner_.get(),
+      FROM_HERE,
       base::Bind(&DriveMetadataDB::GetOrigins,
                  base::Unretained(db_.get()),
                  incremental_sync_origins,
                  disabled_origins),
       base::Bind(&DriveMetadataStore::DidRestoreOrigins,
-                 AsWeakPtr(), callback,
+                 AsWeakPtr(),
+                 callback,
                  base::Owned(incremental_sync_origins),
                  base::Owned(disabled_origins)));
 }
@@ -371,11 +378,14 @@ void DriveMetadataStore::SetLargestChangeStamp(
   DCHECK_EQ(SYNC_STATUS_OK, db_status_);
   largest_changestamp_ = largest_changestamp;
   base::PostTaskAndReplyWithResult(
-      file_task_runner_, FROM_HERE,
+      file_task_runner_.get(),
+      FROM_HERE,
       base::Bind(&DriveMetadataDB::SetLargestChangestamp,
-                 base::Unretained(db_.get()), largest_changestamp),
+                 base::Unretained(db_.get()),
+                 largest_changestamp),
       base::Bind(&DriveMetadataStore::UpdateDBStatusAndInvokeCallback,
-                 AsWeakPtr(), callback));
+                 AsWeakPtr(),
+                 callback));
 }
 
 int64 DriveMetadataStore::GetLargestChangeStamp() const {
@@ -398,11 +408,15 @@ void DriveMetadataStore::UpdateEntry(
     result.first->second = metadata;
 
   base::PostTaskAndReplyWithResult(
-      file_task_runner_, FROM_HERE,
-      base::Bind(&DriveMetadataDB::UpdateEntry, base::Unretained(db_.get()),
-                 url, metadata),
+      file_task_runner_.get(),
+      FROM_HERE,
+      base::Bind(&DriveMetadataDB::UpdateEntry,
+                 base::Unretained(db_.get()),
+                 url,
+                 metadata),
       base::Bind(&DriveMetadataStore::UpdateDBStatusAndInvokeCallback,
-                 AsWeakPtr(), callback));
+                 AsWeakPtr(),
+                 callback));
 }
 
 void DriveMetadataStore::DeleteEntry(
@@ -419,11 +433,13 @@ void DriveMetadataStore::DeleteEntry(
 
   if (found->second.erase(url.path()) == 1) {
     base::PostTaskAndReplyWithResult(
-        file_task_runner_, FROM_HERE,
-        base::Bind(&DriveMetadataDB::DeleteEntry,
-                   base::Unretained(db_.get()), url),
+        file_task_runner_.get(),
+        FROM_HERE,
+        base::Bind(
+            &DriveMetadataDB::DeleteEntry, base::Unretained(db_.get()), url),
         base::Bind(&DriveMetadataStore::UpdateDBStatusAndInvokeCallback,
-                   AsWeakPtr(), callback));
+                   AsWeakPtr(),
+                   callback));
     return;
   }
 
@@ -462,9 +478,12 @@ void DriveMetadataStore::AddIncrementalSyncOrigin(
 
   // Store a pair of |origin| and |resource_id| in the DB.
   base::PostTaskAndReplyWithResult(
-      file_task_runner_, FROM_HERE,
+      file_task_runner_.get(),
+      FROM_HERE,
       base::Bind(&DriveMetadataDB::UpdateOriginAsIncrementalSync,
-                 base::Unretained(db_.get()), origin, resource_id),
+                 base::Unretained(db_.get()),
+                 origin,
+                 resource_id),
       base::Bind(&DriveMetadataStore::UpdateDBStatus, AsWeakPtr()));
 }
 
@@ -475,9 +494,11 @@ void DriveMetadataStore::SetSyncRootDirectory(const std::string& resource_id) {
 
   // Set the resource ID for the sync root directory in the DB.
   base::PostTaskAndReplyWithResult(
-      file_task_runner_, FROM_HERE,
+      file_task_runner_.get(),
+      FROM_HERE,
       base::Bind(&DriveMetadataDB::SetSyncRootDirectory,
-                 base::Unretained(db_.get()), resource_id),
+                 base::Unretained(db_.get()),
+                 resource_id),
       base::Bind(&DriveMetadataStore::UpdateDBStatus, AsWeakPtr()));
 }
 
@@ -499,9 +520,13 @@ void DriveMetadataStore::SetOriginRootDirectory(
     return;
   }
   base::PostTaskAndReplyWithResult(
-      file_task_runner_, FROM_HERE,
+      file_task_runner_.get(),
+      FROM_HERE,
       base::Bind(&DriveMetadataDB::SetOriginRootDirectory,
-                 base::Unretained(db_.get()), origin, sync_type, resource_id),
+                 base::Unretained(db_.get()),
+                 origin,
+                 sync_type,
+                 resource_id),
       base::Bind(&DriveMetadataStore::UpdateDBStatus, AsWeakPtr()));
 }
 
@@ -541,9 +566,12 @@ void DriveMetadataStore::EnableOrigin(
 
   // Store a pair of |origin| and |resource_id| in the DB.
   base::PostTaskAndReplyWithResult(
-      file_task_runner_, FROM_HERE,
+      file_task_runner_.get(),
+      FROM_HERE,
       base::Bind(&DriveMetadataDB::EnableOrigin,
-                 base::Unretained(db_.get()), origin, resource_id),
+                 base::Unretained(db_.get()),
+                 origin,
+                 resource_id),
       base::Bind(&DriveMetadataStore::DidUpdateOrigin, AsWeakPtr(), callback));
 }
 
@@ -569,9 +597,12 @@ void DriveMetadataStore::DisableOrigin(
 
   // Store a pair of |origin| and |resource_id| in the DB.
   base::PostTaskAndReplyWithResult(
-      file_task_runner_, FROM_HERE,
+      file_task_runner_.get(),
+      FROM_HERE,
       base::Bind(&DriveMetadataDB::DisableOrigin,
-                 base::Unretained(db_.get()), origin, resource_id),
+                 base::Unretained(db_.get()),
+                 origin,
+                 resource_id),
       base::Bind(&DriveMetadataStore::DidUpdateOrigin, AsWeakPtr(), callback));
 }
 
@@ -589,9 +620,10 @@ void DriveMetadataStore::RemoveOrigin(
   }
 
   base::PostTaskAndReplyWithResult(
-      file_task_runner_, FROM_HERE,
-      base::Bind(&DriveMetadataDB::RemoveOrigin,
-                 base::Unretained(db_.get()), origin),
+      file_task_runner_.get(),
+      FROM_HERE,
+      base::Bind(
+          &DriveMetadataDB::RemoveOrigin, base::Unretained(db_.get()), origin),
       base::Bind(&DriveMetadataStore::DidUpdateOrigin, AsWeakPtr(), callback));
 }
 
diff --git a/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc b/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc
index 2fce846..996ac0f 100644
--- a/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_metadata_store_unittest.cc
@@ -99,10 +99,13 @@ class DriveMetadataStoreTest : public testing::Test {
     bool created = false;
 
     drive_metadata_store_.reset(
-        new DriveMetadataStore(base_dir_.path(), file_task_runner_));
+        new DriveMetadataStore(base_dir_.path(), file_task_runner_.get()));
     drive_metadata_store_->Initialize(
         base::Bind(&DriveMetadataStoreTest::DidInitializeDatabase,
-                   base::Unretained(this), &done, &status, &created));
+                   base::Unretained(this),
+                   &done,
+                   &status,
+                   &created));
     message_loop_.Run();
 
     EXPECT_TRUE(done);
diff --git a/chrome/browser/sync_file_system/local_file_sync_service.cc b/chrome/browser/sync_file_system/local_file_sync_service.cc
index 1a7bc3a..c67f1cc 100644
--- a/chrome/browser/sync_file_system/local_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/local_file_sync_service.cc
@@ -221,10 +221,13 @@ void LocalFileSyncService::PrepareForProcessRemoteChange(
     MaybeInitializeFileSystemContext(
         url.origin(),
         service_name,
-        file_system_context,
+        file_system_context.get(),
         base::Bind(&LocalFileSyncService::DidInitializeForRemoteSync,
-                   AsWeakPtr(), url, service_name,
-                   file_system_context, callback));
+                   AsWeakPtr(),
+                   url,
+                   service_name,
+                   file_system_context,
+                   callback));
     return;
   }
 
diff --git a/chrome/browser/task_manager/task_manager_unittest.cc b/chrome/browser/task_manager/task_manager_unittest.cc
index 1e85db2..cc86f8c 100644
--- a/chrome/browser/task_manager/task_manager_unittest.cc
+++ b/chrome/browser/task_manager/task_manager_unittest.cc
@@ -66,13 +66,13 @@ class TaskManagerTest : public testing::Test {
 
 TEST_F(TaskManagerTest, Basic) {
   TaskManager task_manager;
-  TaskManagerModel* model = task_manager.model_;
+  TaskManagerModel* model = task_manager.model_.get();
   EXPECT_EQ(0, model->ResourceCount());
 }
 
 TEST_F(TaskManagerTest, Resources) {
   TaskManager task_manager;
-  TaskManagerModel* model = task_manager.model_;
+  TaskManagerModel* model = task_manager.model_.get();
 
   TestResource resource1, resource2;
 
@@ -113,7 +113,7 @@ TEST_F(TaskManagerTest, Resources) {
 TEST_F(TaskManagerTest, RefreshCalled) {
   base::MessageLoop loop;
   TaskManager task_manager;
-  TaskManagerModel* model = task_manager.model_;
+  TaskManagerModel* model = task_manager.model_.get();
   TestResource resource;
 
   task_manager.AddResource(&resource);
diff --git a/chrome/browser/task_manager/worker_resource_provider.cc b/chrome/browser/task_manager/worker_resource_provider.cc
index d1e75fb..deeb14a 100644
--- a/chrome/browser/task_manager/worker_resource_provider.cc
+++ b/chrome/browser/task_manager/worker_resource_provider.cc
@@ -141,7 +141,7 @@ void SharedWorkerResource::Inspect() const {
     return;
   scoped_refptr<DevToolsAgentHost> agent_host(
       DevToolsAgentHost::GetForWorker(process_id_, routing_id_));
-  DevToolsWindow::OpenDevToolsWindowForWorker(profile, agent_host);
+  DevToolsWindow::OpenDevToolsWindowForWorker(profile, agent_host.get());
 }
 
 bool SharedWorkerResource::SupportNetworkUsage() const {
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index 977b8e9..017a60f 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -786,7 +786,7 @@ base::RefCountedMemory* BrowserThemePack::GetRawData(
     } else {
       RawImages::const_iterator it = image_memory_.find(raw_id);
       if (it != image_memory_.end()) {
-        memory = it->second;
+        memory = it->second.get();
       }
     }
   }
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index 5b8fa92..988757a 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -181,7 +181,7 @@ bool ThemeService::HasCustomImage(int id) const {
   if (!Properties::IsThemeableImage(id))
     return false;
 
-  if (theme_pack_)
+  if (theme_pack_.get())
     return theme_pack_->HasCustomImage(id);
 
   return false;
diff --git a/chrome/browser/themes/theme_service_unittest.cc b/chrome/browser/themes/theme_service_unittest.cc
index e6bcf15..803b288 100644
--- a/chrome/browser/themes/theme_service_unittest.cc
+++ b/chrome/browser/themes/theme_service_unittest.cc
@@ -30,7 +30,7 @@ class ThemeServiceTest : public ExtensionServiceTestBase {
         extensions::Extension::Create(
             path, extensions::Manifest::EXTERNAL_PREF_DOWNLOAD,
             source, extensions::Extension::NO_FLAGS, &error);
-    EXPECT_TRUE(extension);
+    EXPECT_TRUE(extension.get());
     EXPECT_EQ("", error);
     return extension;
   }
@@ -51,7 +51,7 @@ TEST_F(ThemeServiceTest, ThemeInstallUninstall) {
   theme_service->UseDefaultTheme();
   scoped_refptr<extensions::Extension> extension =
       MakeThemeExtension(temp_dir.path());
-  service_->FinishInstallationForTest(extension);
+  service_->FinishInstallationForTest(extension.get());
   // Let ThemeService finish creating the theme pack.
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(theme_service->UsingDefaultTheme());
@@ -73,7 +73,7 @@ TEST_F(ThemeServiceTest, ThemeUpgrade) {
   theme_service->UseDefaultTheme();
   scoped_refptr<extensions::Extension> extension =
       MakeThemeExtension(temp_dir.path());
-  service_->FinishInstallationForTest(extension);
+  service_->FinishInstallationForTest(extension.get());
   // Let ThemeService finish creating the theme pack.
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(theme_service->UsingDefaultTheme());
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc
index be32f67..3ff4195 100644
--- a/chrome/browser/themes/theme_syncable_service_unittest.cc
+++ b/chrome/browser/themes/theme_syncable_service_unittest.cc
@@ -107,7 +107,7 @@ class FakeThemeService : public ThemeService {
   }
 
   virtual string GetThemeID() const OVERRIDE {
-    if (theme_extension_)
+    if (theme_extension_.get())
       return theme_extension_->id();
     else
       return std::string();
@@ -152,7 +152,7 @@ scoped_refptr<extensions::Extension> MakeThemeExtension(
       extensions::Extension::Create(
           extension_path, location, source,
           extensions::Extension::NO_FLAGS, &error);
-  EXPECT_TRUE(extension);
+  EXPECT_TRUE(extension.get());
   EXPECT_EQ("", error);
   return extension;
 }
@@ -206,7 +206,7 @@ class ThemeSyncableServiceTest : public testing::Test {
         new extensions::PermissionSet(empty_set, empty_extent, empty_extent);
     service->extension_prefs()->AddGrantedPermissions(
         theme_extension_->id(), permissions.get());
-    service->AddExtension(theme_extension_);
+    service->AddExtension(theme_extension_.get());
     ASSERT_EQ(1u, service->extensions()->size());
   }
 
@@ -389,8 +389,9 @@ TEST_F(ThemeSyncableServiceTest, UpdateThemeSpecificsFromCurrentTheme) {
   EXPECT_TRUE(theme_specifics.use_custom_theme());
   EXPECT_EQ(theme_extension_->id(), theme_specifics.custom_theme_id());
   EXPECT_EQ(theme_extension_->name(), theme_specifics.custom_theme_name());
-  EXPECT_EQ(extensions::ManifestURL::GetUpdateURL(theme_extension_).spec(),
-            theme_specifics.custom_theme_update_url());
+  EXPECT_EQ(
+      extensions::ManifestURL::GetUpdateURL(theme_extension_.get()).spec(),
+      theme_specifics.custom_theme_update_url());
 }
 
 TEST_F(ThemeSyncableServiceTest, GetAllSyncData) {
@@ -406,8 +407,9 @@ TEST_F(ThemeSyncableServiceTest, GetAllSyncData) {
   EXPECT_TRUE(theme_specifics.use_custom_theme());
   EXPECT_EQ(theme_extension_->id(), theme_specifics.custom_theme_id());
   EXPECT_EQ(theme_extension_->name(), theme_specifics.custom_theme_name());
-  EXPECT_EQ(extensions::ManifestURL::GetUpdateURL(theme_extension_).spec(),
-            theme_specifics.custom_theme_update_url());
+  EXPECT_EQ(
+      extensions::ManifestURL::GetUpdateURL(theme_extension_.get()).spec(),
+      theme_specifics.custom_theme_update_url());
 }
 
 TEST_F(ThemeSyncableServiceTest, ProcessSyncThemeChange) {
@@ -469,8 +471,9 @@ TEST_F(ThemeSyncableServiceTest, OnThemeChangeByUser) {
   EXPECT_TRUE(change_specifics.use_custom_theme());
   EXPECT_EQ(theme_extension_->id(), change_specifics.custom_theme_id());
   EXPECT_EQ(theme_extension_->name(), change_specifics.custom_theme_name());
-  EXPECT_EQ(extensions::ManifestURL::GetUpdateURL(theme_extension_).spec(),
-            change_specifics.custom_theme_update_url());
+  EXPECT_EQ(
+      extensions::ManifestURL::GetUpdateURL(theme_extension_.get()).spec(),
+      change_specifics.custom_theme_update_url());
 }
 
 TEST_F(ThemeSyncableServiceTest, StopSync) {
diff --git a/chrome/browser/thumbnails/thumbnail_service_impl.cc b/chrome/browser/thumbnails/thumbnail_service_impl.cc
index 3b108ac..21f722792 100644
--- a/chrome/browser/thumbnails/thumbnail_service_impl.cc
+++ b/chrome/browser/thumbnails/thumbnail_service_impl.cc
@@ -29,7 +29,7 @@ ThumbnailServiceImpl::~ThumbnailServiceImpl() {
 bool ThumbnailServiceImpl::SetPageThumbnail(const ThumbnailingContext& context,
                                             const gfx::Image& thumbnail) {
   scoped_refptr<history::TopSites> local_ptr(top_sites_);
-  if (local_ptr == NULL)
+  if (local_ptr.get() == NULL)
     return false;
 
   return local_ptr->SetPageThumbnail(context.url, thumbnail, context.score);
@@ -39,7 +39,7 @@ bool ThumbnailServiceImpl::GetPageThumbnail(
     const GURL& url,
     scoped_refptr<base::RefCountedMemory>* bytes) {
   scoped_refptr<history::TopSites> local_ptr(top_sites_);
-  if (local_ptr == NULL)
+  if (local_ptr.get() == NULL)
     return false;
 
   return local_ptr->GetPageThumbnail(url, bytes);
@@ -53,7 +53,7 @@ ThumbnailingAlgorithm* ThumbnailServiceImpl::GetThumbnailingAlgorithm()
 bool ThumbnailServiceImpl::ShouldAcquirePageThumbnail(const GURL& url) {
   scoped_refptr<history::TopSites> local_ptr(top_sites_);
 
-  if (local_ptr == NULL)
+  if (local_ptr.get() == NULL)
     return false;
 
   // Skip if the given URL is not appropriate for history.
diff --git a/chrome/browser/thumbnails/thumbnail_service_unittest.cc b/chrome/browser/thumbnails/thumbnail_service_unittest.cc
index b704731..1b128e3 100644
--- a/chrome/browser/thumbnails/thumbnail_service_unittest.cc
+++ b/chrome/browser/thumbnails/thumbnail_service_unittest.cc
@@ -60,7 +60,7 @@ class MockProfile : public TestingProfile {
   }
 
   virtual history::TopSites* GetTopSites() OVERRIDE {
-    return mock_top_sites_;
+    return mock_top_sites_.get();
   }
 
   void AddKnownURL(const GURL& url, const ThumbnailScore& score) {
diff --git a/chrome/browser/thumbnails/thumbnail_tab_helper.cc b/chrome/browser/thumbnails/thumbnail_tab_helper.cc
index c55920a..7060408 100644
--- a/chrome/browser/thumbnails/thumbnail_tab_helper.cc
+++ b/chrome/browser/thumbnails/thumbnail_tab_helper.cc
@@ -206,7 +206,7 @@ void ThumbnailTabHelper::UpdateThumbnailIfNecessary(
       ThumbnailServiceFactory::GetForProfile(profile);
 
   // Skip if we don't need to update the thumbnail.
-  if (thumbnail_service == NULL ||
+  if (thumbnail_service.get() == NULL ||
       !thumbnail_service->ShouldAcquirePageThumbnail(url)) {
     return;
   }
@@ -214,10 +214,8 @@ void ThumbnailTabHelper::UpdateThumbnailIfNecessary(
   scoped_refptr<thumbnails::ThumbnailingAlgorithm> algorithm(
       thumbnail_service->GetThumbnailingAlgorithm());
 
-  scoped_refptr<ThumbnailingContext> context(
-      new ThumbnailingContext(web_contents,
-                              thumbnail_service,
-                              load_interrupted_));
+  scoped_refptr<ThumbnailingContext> context(new ThumbnailingContext(
+      web_contents, thumbnail_service.get(), load_interrupted_));
   AsyncProcessThumbnail(web_contents, context, algorithm);
 }
 
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc
index 28bae2d..a9bc9dc 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_browsertest.cc
@@ -37,7 +37,7 @@ class TestAutofillExternalDelegate : public AutofillExternalDelegate {
   virtual void OnPopupHidden(content::KeyboardListener* listener) OVERRIDE {
     popup_hidden_ = true;
 
-    if (message_loop_runner_)
+    if (message_loop_runner_.get())
       message_loop_runner_->Quit();
 
     AutofillExternalDelegate::OnPopupHidden(listener);
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 9cb4c5f..510863a 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2196,12 +2196,12 @@ bool Browser::MaybeCreateBackgroundContents(int route_id,
       content::SiteInstance::Create(opener_web_contents->GetBrowserContext());
 
   // Passed all the checks, so this should be created as a BackgroundContents.
-  BackgroundContents* contents = service->CreateBackgroundContents(
-      site_instance,
-      route_id,
-      profile_,
-      frame_name,
-      ASCIIToUTF16(extension->id()));
+  BackgroundContents* contents =
+      service->CreateBackgroundContents(site_instance.get(),
+                                        route_id,
+                                        profile_,
+                                        frame_name,
+                                        ASCIIToUTF16(extension->id()));
 
   // When a separate process is used, the original renderer cannot access the
   // new window later, thus we need to navigate the window now.
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index 103bd97..2e97e0e 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -626,7 +626,7 @@ void BrowserActionsToolbarGtk::CreateAllButtons() {
   const extensions::ExtensionList& toolbar_items = model_->toolbar_items();
   for (extensions::ExtensionList::const_iterator iter = toolbar_items.begin();
        iter != toolbar_items.end(); ++iter) {
-    CreateButtonForExtension(*iter, i++);
+    CreateButtonForExtension(iter->get(), i++);
   }
 }
 
@@ -796,9 +796,9 @@ bool BrowserActionsToolbarGtk::IsCommandIdChecked(int command_id) const {
 }
 
 bool BrowserActionsToolbarGtk::IsCommandIdEnabled(int command_id) const {
-  const Extension* extension = model_->toolbar_items()[command_id];
-  return ExtensionActionManager::Get(profile_)->
-      GetBrowserAction(*extension)->GetIsVisible(GetCurrentTabId());
+  const Extension* extension = model_->toolbar_items()[command_id].get();
+  return ExtensionActionManager::Get(profile_)->GetBrowserAction(*extension)
+      ->GetIsVisible(GetCurrentTabId());
 }
 
 bool BrowserActionsToolbarGtk::GetAcceleratorForCommandId(
@@ -808,7 +808,7 @@ bool BrowserActionsToolbarGtk::GetAcceleratorForCommandId(
 }
 
 void BrowserActionsToolbarGtk::ExecuteCommand(int command_id, int event_flags) {
-  const Extension* extension = model_->toolbar_items()[command_id];
+  const Extension* extension = model_->toolbar_items()[command_id].get();
   GURL popup_url;
 
   switch (model_->ExecuteBrowserAction(extension, browser(), &popup_url)) {
@@ -1040,7 +1040,7 @@ gboolean BrowserActionsToolbarGtk::OnOverflowButtonPress(
     if (profile_->IsOffTheRecord())
       model_index = model_->IncognitoIndexToOriginal(i);
 
-    const Extension* extension = model_->toolbar_items()[model_index];
+    const Extension* extension = model_->toolbar_items()[model_index].get();
     BrowserActionButton* button = extension_button_map_[extension->id()].get();
 
     overflow_menu_model_->AddItem(model_index, UTF8ToUTF16(extension->name()));
@@ -1080,9 +1080,8 @@ gboolean BrowserActionsToolbarGtk::OnOverflowMenuButtonPress(
   if (profile_->IsOffTheRecord())
     item_index = model_->IncognitoIndexToOriginal(item_index);
 
-  const Extension* extension = model_->toolbar_items()[item_index];
-  ExtensionButtonMap::iterator it = extension_button_map_.find(
-      extension->id());
+  const Extension* extension = model_->toolbar_items()[item_index].get();
+  ExtensionButtonMap::iterator it = extension_button_map_.find(extension->id());
   if (it == extension_button_map_.end()) {
     NOTREACHED();
     return FALSE;
diff --git a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
index 6cb5ac0..1edced9 100644
--- a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
+++ b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
@@ -226,12 +226,12 @@ gboolean ExtensionInfoBarGtk::OnButtonPress(GtkWidget* widget,
   DCHECK(button_);
 
   context_menu_model_ = BuildMenuModel();
-  if (!context_menu_model_)
+  if (!context_menu_model_.get())
     return FALSE;
 
   gtk_chrome_button_set_paint_state(GTK_CHROME_BUTTON(widget),
                                     GTK_STATE_ACTIVE);
-  ShowMenuWithModel(widget, this, context_menu_model_);
+  ShowMenuWithModel(widget, this, context_menu_model_.get());
 
   return TRUE;
 }
diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
index 24fb540..884d8e8 100644
--- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
+++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
@@ -241,7 +241,7 @@ net::X509Certificate* SSLClientCertificateSelector::GetSelectedCert() {
   if (selected >= 0 &&
       selected < static_cast<int>(
           cert_request_info()->client_certs.size()))
-    return cert_request_info()->client_certs[selected];
+    return cert_request_info()->client_certs[selected].get();
   return NULL;
 }
 
diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc
index ab62c90..08fc2df 100644
--- a/chrome/browser/ui/login/login_prompt.cc
+++ b/chrome/browser/ui/login/login_prompt.cc
@@ -87,7 +87,7 @@ LoginHandler::LoginHandler(net::AuthChallengeInfo* auth_info,
   // here. BuildViewForPasswordManager() will be invoked on the UI thread
   // later, so wait with loading the nib until then.
   DCHECK(request_) << "LoginHandler constructed with NULL request";
-  DCHECK(auth_info_) << "LoginHandler constructed with NULL auth info";
+  DCHECK(auth_info_.get()) << "LoginHandler constructed with NULL auth info";
 
   AddRef();  // matched by LoginHandler::ReleaseSoon().
 
diff --git a/chrome/browser/ui/login/login_prompt_unittest.cc b/chrome/browser/ui/login/login_prompt_unittest.cc
index b3aae1a..109cbca 100644
--- a/chrome/browser/ui/login/login_prompt_unittest.cc
+++ b/chrome/browser/ui/login/login_prompt_unittest.cc
@@ -35,7 +35,7 @@ TEST(LoginPromptTest, GetSignonRealm) {
   };
 
   for (size_t i = 0; i < arraysize(url); i++) {
-    std::string key = GetSignonRealm(GURL(url[i]), *auth_info);
+    std::string key = GetSignonRealm(GURL(url[i]), *auth_info.get());
     EXPECT_EQ(expected[i], key);
   }
 }
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 7619d91..5551fb2 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -1499,8 +1499,8 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
       content::Source<Panel>(panel1));
 
   // Send unload notification on the first extension.
-  extensions::UnloadedExtensionInfo details(extension,
-                                extension_misc::UNLOAD_REASON_UNINSTALL);
+  extensions::UnloadedExtensionInfo details(
+      extension.get(), extension_misc::UNLOAD_REASON_UNINSTALL);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::Source<Profile>(browser()->profile()),
diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc
index 999acde..46fd66f 100644
--- a/chrome/browser/ui/search/instant_controller.cc
+++ b/chrome/browser/ui/search/instant_controller.cc
@@ -126,7 +126,7 @@ void AddSessionStorageHistogram(bool extended_enabled,
              it2 = session_storage_map2.begin();
          it1 != session_storage_map1.end() && it2 != session_storage_map2.end();
          ++it1, ++it2) {
-      if (it1->first != it2->first || it1->second != it2->second) {
+      if (it1->first != it2->first || it1->second.get() != it2->second.get()) {
         is_session_storage_the_same = false;
         break;
       }
diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
index 3bf1e10..53a72a7 100644
--- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
@@ -1156,8 +1156,8 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DISABLED_UnrelatedSiteInstance) {
   scoped_refptr<content::SiteInstance> second_site_instance =
       second_active_tab->GetSiteInstance();
   EXPECT_NE(first_site_instance, second_site_instance);
-  EXPECT_FALSE(first_site_instance->IsRelatedSiteInstance(
-      second_site_instance));
+  EXPECT_FALSE(
+      first_site_instance->IsRelatedSiteInstance(second_site_instance.get()));
 }
 
 // Tests that suggestions are sanity checked.
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index 3cb7888..2aca68b 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -711,7 +711,7 @@ bool StartupBrowserCreator::CreateAutomationProvider(
 
   AutomationProviderList* list = g_browser_process->GetAutomationProviderList();
   DCHECK(list);
-  list->AddProvider(automation);
+  list->AddProvider(automation.get());
 #endif  // defined(ENABLE_AUTOMATION)
 
   return true;
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
index 8085ddc..9ffee12 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
@@ -205,23 +205,17 @@ TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_Extensions) {
   extensions->extension_prefs()->AddGrantedPermissions(
       webstore->id(),
       make_scoped_refptr(new extensions::PermissionSet));
-  extensions->AddExtension(webstore);
-  EXPECT_FALSE(
-      GetCallbackResult(
-          base::Bind(
-              &ui::CheckShouldPromptForNewProfile,
-              profile_.get())));
+  extensions->AddExtension(webstore.get());
+  EXPECT_FALSE(GetCallbackResult(
+      base::Bind(&ui::CheckShouldPromptForNewProfile, profile_.get())));
 
   scoped_refptr<extensions::Extension> extension =
       CreateExtension("foo", std::string());
   extensions->extension_prefs()->AddGrantedPermissions(
       extension->id(), make_scoped_refptr(new extensions::PermissionSet));
-  extensions->AddExtension(extension);
-  EXPECT_TRUE(
-      GetCallbackResult(
-          base::Bind(
-              &ui::CheckShouldPromptForNewProfile,
-              profile_.get())));
+  extensions->AddExtension(extension.get());
+  EXPECT_TRUE(GetCallbackResult(
+      base::Bind(&ui::CheckShouldPromptForNewProfile, profile_.get())));
 }
 
 TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_History) {
diff --git a/chrome/browser/ui/tabs/tab_audio_indicator.cc b/chrome/browser/ui/tabs/tab_audio_indicator.cc
index 5f5faf2..635f438 100644
--- a/chrome/browser/ui/tabs/tab_audio_indicator.cc
+++ b/chrome/browser/ui/tabs/tab_audio_indicator.cc
@@ -69,13 +69,13 @@ void TabAudioIndicator::SetIsPlayingAudio(bool is_playing_audio) {
     state_ = STATE_ANIMATING;
     animation_.reset(
         new ui::LinearAnimation(kAnimationCycleDurationMs, kFPS, this));
-    animation_->SetContainer(animation_container_);
+    animation_->SetContainer(animation_container_.get());
     animation_->Start();
   } else if (!is_playing_audio && state_ == STATE_ANIMATING) {
     state_ = STATE_ANIMATION_ENDING;
     animation_.reset(
         new ui::LinearAnimation(kAnimationEndingDurationMs, kFPS, this));
-    animation_->SetContainer(animation_container_);
+    animation_->SetContainer(animation_container_.get());
     animation_->Start();
   }
 }
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
index da20cc9..c767a8b 100644
--- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
@@ -1721,12 +1721,12 @@ TEST_F(TabStripModelTest, Apps) {
                         manifest, Extension::NO_FLAGS, &error));
   WebContents* contents1 = CreateWebContents();
   extensions::TabHelper::CreateForWebContents(contents1);
-  extensions::TabHelper::FromWebContents(contents1)->
-      SetExtensionApp(extension_app);
+  extensions::TabHelper::FromWebContents(contents1)
+      ->SetExtensionApp(extension_app.get());
   WebContents* contents2 = CreateWebContents();
   extensions::TabHelper::CreateForWebContents(contents2);
-  extensions::TabHelper::FromWebContents(contents2)->
-      SetExtensionApp(extension_app);
+  extensions::TabHelper::FromWebContents(contents2)
+      ->SetExtensionApp(extension_app.get());
   WebContents* contents3 = CreateWebContents();
 
   SetID(contents1, 1);
diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
index bf83f0e..ad34667 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
@@ -221,7 +221,7 @@ string16 ToolbarModelImpl::GetEVCertName() const {
   // the security level would be NONE.
   content::CertStore::GetInstance()->RetrieveCert(
       GetNavigationController()->GetVisibleEntry()->GetSSL().cert_id, &cert);
-  return GetEVCertName(*cert);
+  return GetEVCertName(*cert.get());
 }
 
 // static
diff --git a/chrome/browser/ui/webui/app_launcher_page_ui.cc b/chrome/browser/ui/webui/app_launcher_page_ui.cc
index b02d6fe..f8cc98e 100644
--- a/chrome/browser/ui/webui/app_launcher_page_ui.cc
+++ b/chrome/browser/ui/webui/app_launcher_page_ui.cc
@@ -109,7 +109,7 @@ void AppLauncherPageUI::HTMLSource::StartDataRequest(
   scoped_refptr<base::RefCountedMemory> html_bytes(
       resource->GetNewTabHTML(is_incognito));
 
-  callback.Run(html_bytes);
+  callback.Run(html_bytes.get());
 }
 
 std::string AppLauncherPageUI::HTMLSource::GetMimeType(
diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
index 438d73d..2862d75 100644
--- a/chrome/browser/ui/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -117,7 +117,7 @@ class BundledDataSource : public content::URLDataSource {
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     scoped_refptr<base::RefCountedStaticMemory> bytes(rb.LoadDataResourceBytes(
         resource_id));
-    callback.Run(bytes);
+    callback.Run(bytes.get());
   }
 
   virtual std::string GetMimeType(const std::string& path) const OVERRIDE {
@@ -152,7 +152,7 @@ class RemoteDataSource : public content::URLDataSource {
 
     GURL url = GURL(kRemoteFrontendBase + path);
     CHECK_EQ(url.host(), kRemoteFrontendDomain);
-    new FetchRequest(request_context_, url, callback);
+    new FetchRequest(request_context_.get(), url, callback);
   }
 
   virtual std::string GetMimeType(const std::string& path) const OVERRIDE {
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
index 8e58c6d..00a6fae 100644
--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -242,7 +242,7 @@ void ExtensionIconSource::OnFaviconDataAvailable(
   if (!request->grayscale) {
     // If we don't need a grayscale image, then we can bypass FinalizeImage
     // to avoid unnecessary conversions.
-    request->callback.Run(bitmap_result.bitmap_data);
+    request->callback.Run(bitmap_result.bitmap_data.get());
     ClearData(request_id);
   } else {
     FinalizeImage(ToBitmap(bitmap_result.bitmap_data->front(),
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index 9c5fe74..75752a9 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -107,7 +107,7 @@ ExtensionSettingsHandler::~ExtensionSettingsHandler() {
 
   // There may be pending file dialogs, we need to tell them that we've gone
   // away so they don't try and call back to us.
-  if (load_extension_dialog_)
+  if (load_extension_dialog_.get())
     load_extension_dialog_->ListenerDestroyed();
 }
 
diff --git a/chrome/browser/ui/webui/extensions/pack_extension_handler.cc b/chrome/browser/ui/webui/extensions/pack_extension_handler.cc
index d201c91..5f79dd6 100644
--- a/chrome/browser/ui/webui/extensions/pack_extension_handler.cc
+++ b/chrome/browser/ui/webui/extensions/pack_extension_handler.cc
@@ -21,7 +21,7 @@ PackExtensionHandler::PackExtensionHandler() {
 PackExtensionHandler::~PackExtensionHandler() {
   // There may be pending file dialogs, we need to tell them that we've gone
   // away so they don't try and call back to us.
-  if (load_extension_dialog_)
+  if (load_extension_dialog_.get())
     load_extension_dialog_->ListenerDestroyed();
 
   if (pack_job_.get())
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index 0552d87..b71df5d 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -271,7 +271,7 @@ void FaviconSource::OnFaviconDataAvailable(
     const chrome::FaviconBitmapResult& bitmap_result) {
   if (bitmap_result.is_valid()) {
     // Forward the data along to the networking system.
-    request.callback.Run(bitmap_result.bitmap_data);
+    request.callback.Run(bitmap_result.bitmap_data.get());
   } else if (!HandleMissingResource(request)) {
     SendDefaultResponse(request);
   }
@@ -300,7 +300,8 @@ void FaviconSource::SendDefaultResponse(const IconRequest& icon_request) {
       resource_id = IDR_DEFAULT_FAVICON;
       break;
   }
-  base::RefCountedMemory* default_favicon = default_favicons_[favicon_index];
+  base::RefCountedMemory* default_favicon =
+      default_favicons_[favicon_index].get();
 
   if (!default_favicon) {
     ui::ScaleFactor scale_factor = icon_request.scale_factor;
diff --git a/chrome/browser/ui/webui/feedback_ui.cc b/chrome/browser/ui/webui/feedback_ui.cc
index 6d44cc2..cbd55c2 100644
--- a/chrome/browser/ui/webui/feedback_ui.cc
+++ b/chrome/browser/ui/webui/feedback_ui.cc
@@ -581,7 +581,7 @@ void FeedbackHandler::GetMostRecentScreenshotsDrive(
 
 
 void FeedbackHandler::HandleSendReport(const ListValue* list_value) {
-  if (!feedback_data_) {
+  if (!feedback_data_.get()) {
     LOG(ERROR) << "Bug report hasn't been intialized yet.";
     return;
   }
diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc
index 2de4b55..3ce49fc 100644
--- a/chrome/browser/ui/webui/fileicon_source.cc
+++ b/chrome/browser/ui/webui/fileicon_source.cc
@@ -107,7 +107,7 @@ void FileIconSource::FetchFileIcon(
         icon->ToImageSkia()->GetRepresentation(scale_factor).sk_bitmap(),
         false, &icon_data->data());
 
-    callback.Run(icon_data);
+    callback.Run(icon_data.get());
   } else {
     // Attach the ChromeURLDataManager request ID to the history request.
     IconRequestDetails details;
@@ -156,7 +156,7 @@ void FileIconSource::OnFileIconDataAvailable(const IconRequestDetails& details,
         false,
         &icon_data->data());
 
-    details.callback.Run(icon_data);
+    details.callback.Run(icon_data.get());
   } else {
     // TODO(glen): send a dummy icon.
     details.callback.Run(NULL);
diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc
index ed35880..e98a086 100644
--- a/chrome/browser/ui/webui/inspect_ui.cc
+++ b/chrome/browser/ui/webui/inspect_ui.cc
@@ -266,10 +266,10 @@ void InspectMessageHandler::HandleInspectCommand(const ListValue* args) {
     return;
   scoped_refptr<DevToolsAgentHost> agent_host(
       DevToolsAgentHost::GetForWorker(process_id, route_id));
-  if (!agent_host)
+  if (!agent_host.get())
     return;
 
-  DevToolsWindow::OpenDevToolsWindowForWorker(profile, agent_host);
+  DevToolsWindow::OpenDevToolsWindowForWorker(profile, agent_host.get());
 }
 
 static void TerminateWorker(int process_id, int route_id) {
@@ -407,7 +407,7 @@ void InspectUI::Observe(int type,
 
 void InspectUI::StopListeningNotifications()
 {
-  if (!observer_)
+  if (!observer_.get())
     return;
   adb_bridge_.reset();
   observer_->InspectUIDestroyed();
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc
index e6f218d..fe35249 100644
--- a/chrome/browser/ui/webui/nacl_ui.cc
+++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -192,7 +192,7 @@ NaClDomHandler::NaClDomHandler()
 }
 
 NaClDomHandler::~NaClDomHandler() {
-  if (proxy_)
+  if (proxy_.get())
     proxy_->set_handler(NULL);
 }
 
@@ -349,7 +349,7 @@ void NaClDomHandler::MaybeRespondToPage() {
     return;
 
   if (!pnacl_path_validated_) {
-    DCHECK(proxy_);
+    DCHECK(proxy_.get());
     proxy_->ValidatePnaclPath();
     return;
   }
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 025c987..a53b040 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -669,7 +669,7 @@ class NetInternalsMessageHandler::IOThreadImpl
 NetInternalsMessageHandler::NetInternalsMessageHandler() {}
 
 NetInternalsMessageHandler::~NetInternalsMessageHandler() {
-  if (proxy_) {
+  if (proxy_.get()) {
     proxy_.get()->OnWebUIDeleted();
     // Notify the handler on the IO thread that the renderer is gone.
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
index 68b8e62..39c56f1 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
@@ -332,7 +332,7 @@ void NewTabUI::NewTabHTMLSource::StartDataRequest(
             ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
                 it->second.second) :
             new base::RefCountedStaticMemory);
-    callback.Run(resource_bytes);
+    callback.Run(resource_bytes.get());
     return;
   }
 
@@ -358,7 +358,7 @@ void NewTabUI::NewTabHTMLSource::StartDataRequest(
       NTPResourceCacheFactory::GetForProfile(profile_)->
       GetNewTabHTML(is_incognito));
 
-  callback.Run(html_bytes);
+  callback.Run(html_bytes.get());
 }
 
 std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string& resource)
diff --git a/chrome/browser/ui/webui/ntp/thumbnail_source.cc b/chrome/browser/ui/webui/ntp/thumbnail_source.cc
index f75111f..4870107 100644
--- a/chrome/browser/ui/webui/ntp/thumbnail_source.cc
+++ b/chrome/browser/ui/webui/ntp/thumbnail_source.cc
@@ -59,7 +59,7 @@ void ThumbnailSource::StartDataRequest(
     // We have the thumbnail.
     callback.Run(data.get());
   } else {
-    callback.Run(default_thumbnail_);
+    callback.Run(default_thumbnail_.get());
   }
 }
 
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
index 4c05f47..1c1e3b0 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
@@ -736,7 +736,7 @@ void CertificateManagerHandler::ImportPersonalSlotUnlocked() {
   // for Chrome OS when the "Import and Bind" option is chosen.
   bool is_extractable = !use_hardware_backed_;
   int result = certificate_manager_model_->ImportFromPKCS12(
-      module_, file_data_, password_, is_extractable);
+      module_.get(), file_data_, password_, is_extractable);
   ImportExportCleanup();
   web_ui()->CallJavascriptFunction("CertificateRestoreOverlay.dismiss");
   int string_id;
diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc
index eefe4fe..219923f 100644
--- a/chrome/browser/ui/webui/options/import_data_handler.cc
+++ b/chrome/browser/ui/webui/options/import_data_handler.cc
@@ -34,7 +34,7 @@ ImportDataHandler::ImportDataHandler() : importer_host_(NULL),
 }
 
 ImportDataHandler::~ImportDataHandler() {
-  if (importer_list_)
+  if (importer_list_.get())
     importer_list_->SetObserver(NULL);
 
   if (importer_host_)
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index 894f69d..85bac3b 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -162,7 +162,7 @@ void OptionsUIHTMLSource::StartDataRequest(
         LoadDataResourceBytes(IDR_OPTIONS_HTML);
   }
 
-  callback.Run(response_bytes);
+  callback.Run(response_bytes.get());
 }
 
 std::string OptionsUIHTMLSource::GetMimeType(const std::string& path) const {
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index dbbfd95..6db50fc 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -550,7 +550,7 @@ void PrintPreviewHandler::HandlePrint(const ListValue* args) {
     UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.PrintToCloudPrint",
                          page_count);
     ReportUserActionHistogram(PRINT_WITH_CLOUD_PRINT);
-    SendCloudPrintJob(data);
+    SendCloudPrintJob(data.get());
   } else {
     UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.PrintToPrinter", page_count);
     ReportUserActionHistogram(PRINT_TO_PRINTER);
@@ -595,10 +595,9 @@ void PrintPreviewHandler::PrintToPdf() {
   if (print_to_pdf_path_.get()) {
     // User has already selected a path, no need to show the dialog again.
     PostPrintToPdfTask();
-  } else if (!select_file_dialog_ ||
-             !select_file_dialog_->IsRunning(
-                  platform_util::GetTopLevel(
-                      preview_web_contents()->GetView()->GetNativeView()))) {
+  } else if (!select_file_dialog_.get() ||
+             !select_file_dialog_->IsRunning(platform_util::GetTopLevel(
+                 preview_web_contents()->GetView()->GetNativeView()))) {
     PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
         web_ui()->GetController());
     // Pre-populating select file dialog with print job title.
@@ -709,7 +708,7 @@ void PrintPreviewHandler::PrintWithCloudPrintDialog() {
   print_dialog_cloud::CreatePrintDialogForBytes(
       preview_web_contents()->GetBrowserContext(),
       modal_parent,
-      data,
+      data.get(),
       title,
       string16(),
       std::string("application/pdf"));
@@ -1079,7 +1078,7 @@ bool PrintPreviewHandler::GetPreviewDataAndTitle(
   print_preview_ui->GetPrintPreviewDataForIndex(
       printing::COMPLETE_PREVIEW_DOCUMENT_INDEX, &tmp_data);
 
-  if (!tmp_data) {
+  if (!tmp_data.get()) {
     // Nothing to print, no preview available.
     return false;
   }
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index 4e10802..b3d8675 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -139,12 +139,12 @@ bool HandleRequestCallback(
         preview_ui_id, page_index, &data);
   }
   if (data.get()) {
-    callback.Run(data);
+    callback.Run(data.get());
     return true;
   }
   // Invalid request.
   scoped_refptr<base::RefCountedBytes> empty_bytes(new base::RefCountedBytes);
-  callback.Run(empty_bytes);
+  callback.Run(empty_bytes.get());
   return true;
 }
 
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
index a367342..18cdd80 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
@@ -107,7 +107,7 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) {
   // This should not cause any memory leaks.
   dummy_data = new base::RefCountedBytes();
   preview_ui->SetPrintPreviewDataForIndex(printing::FIRST_PAGE_INDEX,
-                                          dummy_data);
+                                          dummy_data.get());
 
   // Clear the preview data.
   preview_ui->ClearAllPreviewData();
diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc
index c0a7df3..88d0dd2 100644
--- a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc
+++ b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc
@@ -23,7 +23,7 @@ namespace quota_internals {
 QuotaInternalsHandler::QuotaInternalsHandler() {}
 
 QuotaInternalsHandler::~QuotaInternalsHandler() {
-  if (proxy_)
+  if (proxy_.get())
     proxy_->handler_ = NULL;
 }
 
@@ -85,7 +85,7 @@ void QuotaInternalsHandler::SendMessage(const std::string& message,
 }
 
 void QuotaInternalsHandler::OnRequestInfo(const base::ListValue*) {
-  if (!proxy_)
+  if (!proxy_.get())
     proxy_ = new QuotaInternalsProxy(this);
   proxy_->RequestInfo(
       BrowserContext::GetDefaultStoragePartition(
diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc b/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc
index bba4d13..bd4a8b7 100644
--- a/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc
+++ b/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc
@@ -23,7 +23,7 @@ QuotaInternalsProxy::QuotaInternalsProxy(QuotaInternalsHandler* handler)
 
 void QuotaInternalsProxy::RequestInfo(
     scoped_refptr<quota::QuotaManager> quota_manager) {
-  DCHECK(quota_manager);
+  DCHECK(quota_manager.get());
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
@@ -177,7 +177,7 @@ void QuotaInternalsProxy::DidGetHostUsage(const std::string& host,
 }
 
 void QuotaInternalsProxy::RequestPerOriginInfo(quota::StorageType type) {
-  DCHECK(quota_manager_);
+  DCHECK(quota_manager_.get());
 
   std::set<GURL> origins;
   quota_manager_->GetCachedOrigins(type, &origins);
@@ -217,11 +217,13 @@ void QuotaInternalsProxy::VisitHost(const std::string& host,
 
 void QuotaInternalsProxy::GetHostUsage(const std::string& host,
                                        quota::StorageType type) {
-  DCHECK(quota_manager_);
-  quota_manager_->GetHostUsage(
-      host, type,
-      base::Bind(&QuotaInternalsProxy::DidGetHostUsage,
-                 weak_factory_.GetWeakPtr(), host, type));
+  DCHECK(quota_manager_.get());
+  quota_manager_->GetHostUsage(host,
+                               type,
+                               base::Bind(&QuotaInternalsProxy::DidGetHostUsage,
+                                          weak_factory_.GetWeakPtr(),
+                                          host,
+                                          type));
 }
 
 }  // namespace quota_internals
diff --git a/chrome/browser/ui/webui/session_favicon_source.cc b/chrome/browser/ui/webui/session_favicon_source.cc
index 6891cd0..6aacaa6 100644
--- a/chrome/browser/ui/webui/session_favicon_source.cc
+++ b/chrome/browser/ui/webui/session_favicon_source.cc
@@ -48,7 +48,7 @@ bool SessionFaviconSource::HandleMissingResource(const IconRequest& request) {
   if (associator &&
       associator->GetSyncedFaviconForPageURL(request.request_path.spec(),
                                              &response)) {
-    request.callback.Run(response);
+    request.callback.Run(response.get());
     return true;
   }
   return false;
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
index ce95355..8222132 100644
--- a/chrome/browser/ui/webui/theme_source.cc
+++ b/chrome/browser/ui/webui/theme_source.cc
@@ -70,7 +70,7 @@ void ThemeSource::StartDataRequest(
       uncached_path == kNewIncognitoTabCSSPath) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-    callback.Run(css_bytes_);
+    callback.Run(css_bytes_.get());
     return;
   }
 
@@ -143,7 +143,7 @@ void ThemeSource::SendThemeBitmap(
 
     scoped_refptr<base::RefCountedMemory> image_data(tp->GetRawData(
         resource_id, scale_factor));
-    callback.Run(image_data);
+    callback.Run(image_data.get());
   } else {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
diff --git a/chrome/browser/usb/usb_device.cc b/chrome/browser/usb/usb_device.cc
index dfb5658..13fc395 100644
--- a/chrome/browser/usb/usb_device.cc
+++ b/chrome/browser/usb/usb_device.cc
@@ -260,7 +260,10 @@ void UsbDevice::ControlTransfer(const UsbEndpointDirection direction,
                             converted_type, request, value, index, length);
   libusb_fill_control_transfer(transfer, handle_, reinterpret_cast<uint8*>(
       resized_buffer->data()), HandleTransferCompletion, this, timeout);
-  SubmitTransfer(transfer, USB_TRANSFER_CONTROL, resized_buffer, resized_length,
+  SubmitTransfer(transfer,
+                 USB_TRANSFER_CONTROL,
+                 resized_buffer.get(),
+                 resized_length,
                  callback);
 }
 
diff --git a/chrome/browser/usb/usb_service.cc b/chrome/browser/usb/usb_service.cc
index ccaeaa6..bc8fe41 100644
--- a/chrome/browser/usb/usb_service.cc
+++ b/chrome/browser/usb/usb_service.cc
@@ -200,5 +200,5 @@ UsbDevice* UsbService::LookupOrCreateDevice(PlatformUsbDevice device) {
     UsbDevice* wrapper = new UsbDevice(this, handle);
     devices_[device] = wrapper;
   }
-  return devices_[device];
+  return devices_[device].get();
 }
diff --git a/chrome/browser/webdata/web_data_service_factory.cc b/chrome/browser/webdata/web_data_service_factory.cc
index 3ebeec9..91ec3be 100644
--- a/chrome/browser/webdata/web_data_service_factory.cc
+++ b/chrome/browser/webdata/web_data_service_factory.cc
@@ -50,15 +50,15 @@ void InitSyncableServicesOnDBThread(
   // Currently only Autocomplete and Autofill profiles use the new Sync API, but
   // all the database data should migrate to this API over time.
   AutocompleteSyncableService::CreateForWebDataServiceAndBackend(
-      autofill_web_data, autofill_backend);
-  AutocompleteSyncableService::FromWebDataService(
-      autofill_web_data)->InjectStartSyncFlare(
-          sync_start_util::GetFlareForSyncableService(profile_path));
+      autofill_web_data.get(), autofill_backend);
+  AutocompleteSyncableService::FromWebDataService(autofill_web_data.get())
+      ->InjectStartSyncFlare(
+            sync_start_util::GetFlareForSyncableService(profile_path));
   AutofillProfileSyncableService::CreateForWebDataServiceAndBackend(
-      autofill_web_data, autofill_backend, app_locale);
-  AutofillProfileSyncableService::FromWebDataService(
-      autofill_web_data)->InjectStartSyncFlare(
-          sync_start_util::GetFlareForSyncableService(profile_path));
+      autofill_web_data.get(), autofill_backend, app_locale);
+  AutofillProfileSyncableService::FromWebDataService(autofill_web_data.get())
+      ->InjectStartSyncFlare(
+            sync_start_util::GetFlareForSyncableService(profile_path));
 }
 
 }  // namespace