Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

BUG=423621

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

Cr-Commit-Position: refs/heads/master@{#300016}

32 files changed, 69 insertions, 89 deletions

diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc
index 2a2e5e8..a65c7bb 100644
--- a/chrome/browser/android/dev_tools_server.cc
+++ b/chrome/browser/android/dev_tools_server.cc
@@ -112,11 +112,7 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
         kTetheringSocketName, getpid(), ++last_tethering_socket_);
     return net::deprecated::UnixDomainListenSocket::
         CreateAndListenWithAbstractNamespace(
-            *name,
-            "",
-            delegate,
-            auth_callback_)
-        .PassAs<net::StreamListenSocket>();
+            *name, "", delegate, auth_callback_);
   }
 
  private:
diff --git a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc
index 726d7b6..ee2b462 100644
--- a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc
+++ b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc
@@ -111,8 +111,7 @@ class DriveAppProviderTest : public ExtensionBrowserTest,
     provider_.reset(
         new DriveAppProvider(profile(), fake_uninstall_sync_service_.get()));
     provider_->SetDriveServiceBridgeForTest(
-        make_scoped_ptr(new TestDriveServiceBridge(apps_registry_.get()))
-            .PassAs<DriveServiceBridge>());
+        make_scoped_ptr(new TestDriveServiceBridge(apps_registry_.get())));
 
     // The DriveAppProvider in AppListSyncalbeService interferes with the
     // test. So resets it.
diff --git a/chrome/browser/apps/drive/drive_service_bridge.cc b/chrome/browser/apps/drive/drive_service_bridge.cc
index 743e16a..da31df5 100644
--- a/chrome/browser/apps/drive/drive_service_bridge.cc
+++ b/chrome/browser/apps/drive/drive_service_bridge.cc
@@ -125,7 +125,7 @@ scoped_ptr<DriveServiceBridge> DriveServiceBridge::Create(Profile* profile) {
   scoped_ptr<DriveServiceBridgeImpl> bridge(
       new DriveServiceBridgeImpl(profile));
   bridge->Initialize();
-  return bridge.PassAs<DriveServiceBridge>();
+  return bridge.Pass();
 }
 
 // static
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc
index 6af76a3..cf50c01 100644
--- a/chrome/browser/apps/web_view_browsertest.cc
+++ b/chrome/browser/apps/web_view_browsertest.cc
@@ -490,7 +490,7 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
         new net::test_server::BasicHttpResponse);
     http_response->set_code(net::HTTP_MOVED_PERMANENTLY);
     http_response->AddCustomHeader("Location", redirect_target.spec());
-    return http_response.PassAs<net::test_server::HttpResponse>();
+    return http_response.Pass();
   }
 
   // Handles |request| by serving a redirect response.
@@ -505,7 +505,7 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
         new net::test_server::BasicHttpResponse);
     http_response->set_code(net::HTTP_MOVED_PERMANENTLY);
     http_response->AddCustomHeader("Location", redirect_target.spec());
-    return http_response.PassAs<net::test_server::HttpResponse>();
+    return http_response.Pass();
   }
 
   // Handles |request| by serving an empty response.
diff --git a/chrome/browser/chromeos/app_mode/fake_cws.cc b/chrome/browser/chromeos/app_mode/fake_cws.cc
index 799c6c4..8b3892d 100644
--- a/chrome/browser/chromeos/app_mode/fake_cws.cc
+++ b/chrome/browser/chromeos/app_mode/fake_cws.cc
@@ -138,7 +138,7 @@ scoped_ptr<HttpResponse> FakeCWS::HandleRequest(const HttpRequest& request) {
     http_response->set_code(net::HTTP_OK);
     http_response->set_content_type("text/xml");
     http_response->set_content(update_check_content_);
-    return http_response.PassAs<HttpResponse>();
+    return http_response.Pass();
   }
 
   return scoped_ptr<HttpResponse>();
diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc
index 96bc899..a0e34ba 100644
--- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc
+++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc
@@ -217,7 +217,7 @@ scoped_ptr<HttpResponse> FakeSamlIdp::HandleRequest(
   http_response->AddCustomHeader(
       "Set-cookie",
       base::StringPrintf("saml=%s", cookie_value_.c_str()));
-  return http_response.PassAs<HttpResponse>();
+  return http_response.Pass();
 }
 
 scoped_ptr<HttpResponse> FakeSamlIdp::BuildHTMLResponse(
@@ -235,7 +235,7 @@ scoped_ptr<HttpResponse> FakeSamlIdp::BuildHTMLResponse(
   http_response->set_content(response_html);
   http_response->set_content_type("text/html");
 
-  return http_response.PassAs<HttpResponse>();
+  return http_response.Pass();
 }
 
 }  // namespace
diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
index e0a4f90..721db65 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
+++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
@@ -529,7 +529,7 @@ class FakeGoogle {
       return scoped_ptr<HttpResponse>();      // Request not understood.
     }
 
-    return http_response.PassAs<HttpResponse>();
+    return http_response.Pass();
   }
 
   // True if we have already served the test page.
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service.cc b/chrome/browser/chromeos/platform_keys/platform_keys_service.cc
index 3f8268a..7ba138c 100644
--- a/chrome/browser/chromeos/platform_keys/platform_keys_service.cc
+++ b/chrome/browser/chromeos/platform_keys/platform_keys_service.cc
@@ -185,9 +185,8 @@ void PlatformKeysService::RegisterPublicKeyGotPlatformKeys(
          "times.";
   platform_keys->Append(key_value.release());
 
-  state_store_->SetExtensionValue(extension_id,
-                                  kStateStorePlatformKeys,
-                                  platform_keys.PassAs<base::Value>());
+  state_store_->SetExtensionValue(
+      extension_id, kStateStorePlatformKeys, platform_keys.Pass());
   callback.Run(true);
 }
 
@@ -206,9 +205,8 @@ void PlatformKeysService::InvalidateKey(
     return;
   }
 
-  state_store_->SetExtensionValue(extension_id,
-                                  kStateStorePlatformKeys,
-                                  platform_keys.PassAs<base::Value>());
+  state_store_->SetExtensionValue(
+      extension_id, kStateStorePlatformKeys, platform_keys.Pass());
   callback.Run(true);
 }
 
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
index 6b03b66..2fb4124 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
@@ -65,7 +65,7 @@ KeyedService* BuildProfileInvalidationProvider(
   invalidation_service->SetInvalidatorState(
       syncer::TRANSIENT_INVALIDATION_ERROR);
   return new invalidation::ProfileInvalidationProvider(
-      invalidation_service.PassAs<invalidation::InvalidationService>());
+      invalidation_service.Pass());
 }
 
 }  // namespace
@@ -158,7 +158,7 @@ void DeviceCloudPolicyInvalidatorTest::SetUp() {
   CloudPolicyCore* core = TestingBrowserProcess::GetGlobal()->platform_part()->
       browser_policy_connector_chromeos()->GetDeviceCloudPolicyManager()->
           core();
-  core->Connect(policy_client.PassAs<CloudPolicyClient>());
+  core->Connect(policy_client.Pass());
   core->StartRefreshScheduler();
 
   invalidation::ProfileInvalidationProviderFactory::GetInstance()->
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index c1db9b53..750b6cc 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -314,7 +314,7 @@ scoped_ptr<net::test_server::HttpResponse>
   http_response->set_code(net::HTTP_OK);
   http_response->set_content(content);
   http_response->set_content_type("text/xml");
-  return http_response.PassAs<net::test_server::HttpResponse>();
+  return http_response.Pass();
 }
 
 DictionaryPrefValueWaiter::DictionaryPrefValueWaiter(
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
index e7a14dc..a7ac0a3 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
@@ -201,15 +201,14 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>
           content::BrowserThread::FILE);
 
   scoped_ptr<UserCloudPolicyManagerChromeOS> manager(
-      new UserCloudPolicyManagerChromeOS(
-          store.PassAs<CloudPolicyStore>(),
-          external_data_manager.Pass(),
-          component_policy_cache_dir,
-          wait_for_initial_policy,
-          initial_policy_fetch_timeout,
-          base::MessageLoopProxy::current(),
-          file_task_runner,
-          io_task_runner));
+      new UserCloudPolicyManagerChromeOS(store.Pass(),
+                                         external_data_manager.Pass(),
+                                         component_policy_cache_dir,
+                                         wait_for_initial_policy,
+                                         initial_policy_fetch_timeout,
+                                         base::MessageLoopProxy::current(),
+                                         file_task_runner,
+                                         io_task_runner));
 
   bool wildcard_match = false;
   if (connector->IsEnterpriseManaged() &&
diff --git a/chrome/browser/chromeos/power/power_prefs_unittest.cc b/chrome/browser/chromeos/power/power_prefs_unittest.cc
index cb0041f..db8c137 100644
--- a/chrome/browser/chromeos/power/power_prefs_unittest.cc
+++ b/chrome/browser/chromeos/power/power_prefs_unittest.cc
@@ -166,7 +166,7 @@ TEST_F(PowerPrefsTest, LoginScreen) {
   TestingProfile::Builder builder;
   builder.SetPath(
       profile_manager_.profiles_dir().AppendASCII(chrome::kInitialProfile));
-  builder.SetPrefService(login_profile_prefs.PassAs<PrefServiceSyncable>());
+  builder.SetPrefService(login_profile_prefs.Pass());
   TestingProfile* login_profile = builder.BuildIncognito(
       profile_manager_.CreateTestingProfile(chrome::kInitialProfile));
 
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
index da00272..216d602 100644
--- a/chrome/browser/crash_recovery_browsertest.cc
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -60,7 +60,7 @@ class CacheMaxAgeHandler {
                                              request_count_));
     response->set_content_type("text/html");
     response->AddCustomHeader("Cache-Control", "max-age=99999");
-    return response.PassAs<net::test_server::HttpResponse>();
+    return response.Pass();
   }
  private:
   std::string path_;
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
index 6110231..0d46995 100644
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
@@ -85,6 +85,5 @@ BrowserListTabContentsProvider::CreateSocketForTethering(
     last_tethering_port_ = kMinTetheringPort;
   int port = ++last_tethering_port_;
   *name = base::IntToString(port);
-  return net::TCPListenSocket::CreateAndListen("127.0.0.1", port, delegate)
-      .PassAs<net::StreamListenSocket>();
+  return net::TCPListenSocket::CreateAndListen("127.0.0.1", port, delegate);
 }
diff --git a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
index 4de2b17..9c4ea3e 100644
--- a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
+++ b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
@@ -63,8 +63,8 @@ KeyedService* DomDistillerServiceFactory::BuildServiceInstanceFor(
   base::FilePath database_dir(
       profile->GetPath().Append(FILE_PATH_LITERAL("Articles")));
 
-  scoped_ptr<DomDistillerStore> dom_distiller_store(new DomDistillerStore(
-      db.PassAs<leveldb_proto::ProtoDatabase<ArticleEntry> >(), database_dir));
+  scoped_ptr<DomDistillerStore> dom_distiller_store(
+      new DomDistillerStore(db.Pass(), database_dir));
 
   scoped_ptr<DistillerPageFactory> distiller_page_factory(
       new DistillerPageWebContentsFactory(profile));
@@ -82,11 +82,10 @@ KeyedService* DomDistillerServiceFactory::BuildServiceInstanceFor(
       new DistilledPagePrefs(Profile::FromBrowserContext(profile)->GetPrefs()));
 
   DomDistillerContextKeyedService* service =
-      new DomDistillerContextKeyedService(
-          dom_distiller_store.PassAs<DomDistillerStoreInterface>(),
-          distiller_factory.Pass(),
-          distiller_page_factory.Pass(),
-          distilled_page_prefs.Pass());
+      new DomDistillerContextKeyedService(dom_distiller_store.Pass(),
+                                          distiller_factory.Pass(),
+                                          distiller_page_factory.Pass(),
+                                          distilled_page_prefs.Pass());
 
   return service;
 }
diff --git a/chrome/browser/dom_distiller/tab_utils.cc b/chrome/browser/dom_distiller/tab_utils.cc
index bd9a1c0..8f94218 100644
--- a/chrome/browser/dom_distiller/tab_utils.cc
+++ b/chrome/browser/dom_distiller/tab_utils.cc
@@ -122,8 +122,7 @@ void StartDistillation(content::WebContents* web_contents) {
           web_contents->GetBrowserContext());
   scoped_ptr<DistillerPage> distiller_page =
       dom_distiller_service->CreateDefaultDistillerPageWithHandle(
-                                 source_page_handle.PassAs<SourcePageHandle>())
-          .Pass();
+                                 source_page_handle.Pass()).Pass();
 
   const GURL& last_committed_url = web_contents->GetLastCommittedURL();
   scoped_ptr<ViewerHandle> viewer_handle = dom_distiller_service->ViewUrl(
diff --git a/chrome/browser/download/download_test_file_activity_observer.cc b/chrome/browser/download/download_test_file_activity_observer.cc
index ce3fa04..110feff 100644
--- a/chrome/browser/download/download_test_file_activity_observer.cc
+++ b/chrome/browser/download/download_test_file_activity_observer.cc
@@ -72,9 +72,8 @@ DownloadTestFileActivityObserver::DownloadTestFileActivityObserver(
   scoped_ptr<MockDownloadManagerDelegate> mock_delegate(
       new MockDownloadManagerDelegate(profile));
   test_delegate_ = mock_delegate->GetWeakPtr();
-  DownloadServiceFactory::GetForBrowserContext(profile)->
-      SetDownloadManagerDelegateForTesting(
-          mock_delegate.PassAs<ChromeDownloadManagerDelegate>());
+  DownloadServiceFactory::GetForBrowserContext(profile)
+      ->SetDownloadManagerDelegateForTesting(mock_delegate.Pass());
 }
 
 DownloadTestFileActivityObserver::~DownloadTestFileActivityObserver() {
diff --git a/chrome/browser/download/download_ui_controller_unittest.cc b/chrome/browser/download/download_ui_controller_unittest.cc
index 8476717..d540ca8 100644
--- a/chrome/browser/download/download_ui_controller_unittest.cc
+++ b/chrome/browser/download/download_ui_controller_unittest.cc
@@ -175,9 +175,8 @@ void DownloadUIControllerTest::SetUp() {
 
   scoped_ptr<HistoryAdapter> history_adapter(new HistoryAdapter);
   history_adapter_ = history_adapter.get();
-  scoped_ptr<DownloadHistory> download_history(new DownloadHistory(
-      manager_.get(),
-      history_adapter.PassAs<DownloadHistory::HistoryAdapter>()));
+  scoped_ptr<DownloadHistory> download_history(
+      new DownloadHistory(manager_.get(), history_adapter.Pass()));
   ASSERT_TRUE(download_history_manager_observer_);
 
   EXPECT_CALL(*manager_, AddObserver(_))
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 8d828f6..76933a6 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -467,9 +467,8 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_SaveHTMLOnlyTabDestroy) {
       new DelayingDownloadManagerDelegate(browser()->profile()));
   delaying_delegate->GetDownloadIdReceiverCallback().Run(
       content::DownloadItem::kInvalidId + 1);
-  DownloadServiceFactory::GetForBrowserContext(browser()->profile())->
-      SetDownloadManagerDelegateForTesting(
-          delaying_delegate.PassAs<ChromeDownloadManagerDelegate>());
+  DownloadServiceFactory::GetForBrowserContext(browser()->profile())
+      ->SetDownloadManagerDelegateForTesting(delaying_delegate.Pass());
   DownloadManager* manager(GetDownloadManager());
   std::vector<DownloadItem*> downloads;
   manager->GetAllDownloads(&downloads);
diff --git a/chrome/browser/history/android/android_provider_backend.cc b/chrome/browser/history/android/android_provider_backend.cc
index bfb9019..894b75f 100644
--- a/chrome/browser/history/android/android_provider_backend.cc
+++ b/chrome/browser/history/android/android_provider_backend.cc
@@ -352,7 +352,7 @@ bool AndroidProviderBackend::UpdateHistoryAndBookmarks(
   }
 
   if (!modified->changed_urls.empty()) {
-    scoped_ptr<HistoryDetails> details = modified.PassAs<HistoryDetails>();
+    scoped_ptr<HistoryDetails> details = modified.Pass();
     notifications->push_back(
         base::Bind(&HistoryBackend::Delegate::BroadcastNotifications,
                    base::Unretained(delegate_),
@@ -403,7 +403,7 @@ AndroidURLID AndroidProviderBackend::InsertHistoryAndBookmark(
     favicon->insert(url_row.url());
   }
 
-  scoped_ptr<HistoryDetails> details = modified.PassAs<HistoryDetails>();
+  scoped_ptr<HistoryDetails> details = modified.Pass();
   notifications->push_back(
       base::Bind(&HistoryBackend::Delegate::BroadcastNotifications,
                  base::Unretained(delegate_),
@@ -1066,7 +1066,7 @@ bool AndroidProviderBackend::SimulateUpdateURL(
 
   modified->changed_urls.push_back(new_url_row);
 
-  scoped_ptr<HistoryDetails> details = deleted_details.PassAs<HistoryDetails>();
+  scoped_ptr<HistoryDetails> details = deleted_details.Pass();
   notifications->push_back(
       base::Bind(&HistoryBackend::Delegate::BroadcastNotifications,
                  base::Unretained(delegate_),
@@ -1077,7 +1077,7 @@ bool AndroidProviderBackend::SimulateUpdateURL(
                                         base::Unretained(delegate_),
                                         base::Passed(&favicons)));
   }
-  scoped_ptr<HistoryDetails> other_details = modified.PassAs<HistoryDetails>();
+  scoped_ptr<HistoryDetails> other_details = modified.Pass();
   notifications->push_back(
       base::Bind(&HistoryBackend::Delegate::BroadcastNotifications,
                  base::Unretained(delegate_),
@@ -1146,7 +1146,7 @@ bool AndroidProviderBackend::DeleteHistoryInternal(
         return false;
   }
 
-  scoped_ptr<HistoryDetails> details = deleted_details.PassAs<HistoryDetails>();
+  scoped_ptr<HistoryDetails> details = deleted_details.Pass();
   notifications->push_back(
       base::Bind(&HistoryBackend::Delegate::BroadcastNotifications,
                  base::Unretained(delegate_),
diff --git a/chrome/browser/history/expire_history_backend.cc b/chrome/browser/history/expire_history_backend.cc
index e874d19..b4791d9 100644
--- a/chrome/browser/history/expire_history_backend.cc
+++ b/chrome/browser/history/expire_history_backend.cc
@@ -321,8 +321,7 @@ void ExpireHistoryBackend::BroadcastNotifications(DeleteEffects* effects,
     details->changed_urls = effects->modified_urls;
     delegate_->NotifySyncURLsModified(&details->changed_urls);
     delegate_->BroadcastNotifications(
-        chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
-        details.PassAs<HistoryDetails>());
+        chrome::NOTIFICATION_HISTORY_URLS_MODIFIED, details.Pass());
   }
   if (!effects->deleted_urls.empty()) {
     scoped_ptr<URLsDeletedDetails> details(new URLsDeletedDetails);
@@ -333,7 +332,7 @@ void ExpireHistoryBackend::BroadcastNotifications(DeleteEffects* effects,
     delegate_->NotifySyncURLsDeleted(details->all_history, details->expired,
                                      &details->rows);
     delegate_->BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                                      details.PassAs<HistoryDetails>());
+                                      details.Pass());
   }
 }
 
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index 89716ee..8293a13 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -891,7 +891,7 @@ void HistoryBackend::AddPagesWithDetails(const URLRows& urls,
   // TODO(brettw) bug 1140015: Add an "add page" notification so the history
   // views can keep in sync.
   BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
-                         modified.PassAs<HistoryDetails>());
+                         modified.Pass());
 
   ScheduleCommit();
 }
@@ -941,7 +941,7 @@ void HistoryBackend::SetPageTitle(const GURL& url,
     if (typed_url_syncable_service_.get())
       typed_url_syncable_service_->OnUrlsModified(&details->changed_urls);
     BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
-                           details.PassAs<HistoryDetails>());
+                           details.Pass());
     ScheduleCommit();
   }
 }
@@ -1027,7 +1027,7 @@ size_t HistoryBackend::UpdateURLs(const history::URLRows& urls) {
     if (typed_url_syncable_service_)
       typed_url_syncable_service_->OnUrlsModified(&details->changed_urls);
     BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
-                           details.PassAs<HistoryDetails>());
+                           details.Pass());
     ScheduleCommit();
   }
   return num_updated_records;
@@ -2611,7 +2611,7 @@ void HistoryBackend::DeleteAllHistory() {
   details->all_history = true;
   NotifySyncURLsDeleted(true, false, NULL);
   BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                         details.PassAs<HistoryDetails>());
+                         details.Pass());
 }
 
 bool HistoryBackend::ClearAllThumbnailHistory(const URLRows& kept_urls) {
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index 8244eb1..582a344 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -436,17 +436,17 @@ class InMemoryHistoryBackendTest : public HistoryBackendTestBase {
     if (type == chrome::NOTIFICATION_HISTORY_URLS_MODIFIED) {
       scoped_ptr<URLsModifiedDetails> details(new URLsModifiedDetails());
       details->changed_urls.swap(rows);
-      BroadcastNotifications(type, details.PassAs<HistoryDetails>());
+      BroadcastNotifications(type, details.Pass());
     } else if (type == chrome::NOTIFICATION_HISTORY_URL_VISITED) {
       for (URLRows::const_iterator it = rows.begin(); it != rows.end(); ++it) {
         scoped_ptr<URLVisitedDetails> details(new URLVisitedDetails());
         details->row = *it;
-        BroadcastNotifications(type, details.PassAs<HistoryDetails>());
+        BroadcastNotifications(type, details.Pass());
       }
     } else if (type == chrome::NOTIFICATION_HISTORY_URLS_DELETED) {
       scoped_ptr<URLsDeletedDetails> details(new URLsDeletedDetails());
       details->rows = rows;
-      BroadcastNotifications(type, details.PassAs<HistoryDetails>());
+      BroadcastNotifications(type, details.Pass());
     } else {
       NOTREACHED();
     }
@@ -3148,7 +3148,7 @@ TEST_F(InMemoryHistoryBackendTest, OnURLsDeletedEnMasse) {
   scoped_ptr<URLsDeletedDetails> details(new URLsDeletedDetails());
   details->all_history = true;
   BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                         details.PassAs<HistoryDetails>());
+                         details.Pass());
 
   // Expect that everything goes away.
   EXPECT_EQ(0, mem_backend_->db()->GetRowForURL(row1.url(), NULL));
diff --git a/chrome/browser/history/web_history_service.cc b/chrome/browser/history/web_history_service.cc
index 2069826..1587daf 100644
--- a/chrome/browser/history/web_history_service.cc
+++ b/chrome/browser/history/web_history_service.cc
@@ -320,7 +320,7 @@ scoped_ptr<WebHistoryService::Request> WebHistoryService::QueryHistory(
   scoped_ptr<RequestImpl> request(
       new RequestImpl(profile_, url, completion_callback));
   request->Start();
-  return request.PassAs<Request>();
+  return request.Pass();
 }
 
 void WebHistoryService::ExpireHistory(
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
index 336c830..0c9210a 100644
--- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
@@ -133,7 +133,7 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
   service->Init(scoped_ptr<syncer::InvalidationStateTracker>(
       new InvalidatorStorage(profile->GetPrefs())));
 
-  return new ProfileInvalidationProvider(service.PassAs<InvalidationService>());
+  return new ProfileInvalidationProvider(service.Pass());
 #endif
 }
 
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 7983f1c..f6ae516 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -220,13 +220,13 @@ scoped_ptr<net::HostResolver> CreateGlobalHostResolver(net::NetLog* net_log) {
   // rules on top of the real host resolver. This allows forwarding all requests
   // through a designated test server.
   if (!command_line.HasSwitch(switches::kHostResolverRules))
-    return global_host_resolver.PassAs<net::HostResolver>();
+    return global_host_resolver.Pass();
 
   scoped_ptr<net::MappedHostResolver> remapped_resolver(
       new net::MappedHostResolver(global_host_resolver.Pass()));
   remapped_resolver->SetRulesFromString(
       command_line.GetSwitchValueASCII(switches::kHostResolverRules));
-  return remapped_resolver.PassAs<net::HostResolver>();
+  return remapped_resolver.Pass();
 }
 
 // TODO(willchan): Remove proxy script fetcher context since it's not necessary
@@ -710,8 +710,7 @@ void IOThread::InitAsync() {
       new net::FtpProtocolHandler(
           globals_->proxy_script_fetcher_ftp_transaction_factory.get()));
 #endif
-  globals_->proxy_script_fetcher_url_request_job_factory =
-      job_factory.PassAs<net::URLRequestJobFactory>();
+  globals_->proxy_script_fetcher_url_request_job_factory = job_factory.Pass();
 
   globals_->throttler_manager.reset(new net::URLRequestThrottlerManager());
   globals_->throttler_manager->set_net_log(net_log_);
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index 842103f..28e4d6e 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -739,9 +739,8 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest,
   // Set up the fake delegate that forces the download to be malicious.
   scoped_ptr<TestDownloadManagerDelegate> test_delegate(
       new TestDownloadManagerDelegate(browser()->profile()));
-  DownloadServiceFactory::GetForBrowserContext(browser()->profile())->
-      SetDownloadManagerDelegateForTesting(
-          test_delegate.PassAs<ChromeDownloadManagerDelegate>());
+  DownloadServiceFactory::GetForBrowserContext(browser()->profile())
+      ->SetDownloadManagerDelegateForTesting(test_delegate.Pass());
 
   // Run a dangerous download, but the user doesn't make a decision.
   // This .swf normally would be categorized as DANGEROUS_FILE, but
diff --git a/chrome/browser/local_discovery/gcd_api_flow_unittest.cc b/chrome/browser/local_discovery/gcd_api_flow_unittest.cc
index a9edd86..15074e1 100644
--- a/chrome/browser/local_discovery/gcd_api_flow_unittest.cc
+++ b/chrome/browser/local_discovery/gcd_api_flow_unittest.cc
@@ -63,7 +63,7 @@ class GCDApiFlowTest : public testing::Test {
             GURL("https://www.google.com/cloudprint/confirm?token=SomeToken")));
     gcd_flow_.reset(new GCDApiFlowImpl(
         request_context_.get(), &token_service_, account_id_));
-    gcd_flow_->Start(delegate.PassAs<GCDApiFlow::Request>());
+    gcd_flow_->Start(delegate.Pass());
   }
   base::MessageLoopForUI loop_;
   content::TestBrowserThread ui_thread_;
diff --git a/chrome/browser/local_discovery/privet_device_lister_unittest.cc b/chrome/browser/local_discovery/privet_device_lister_unittest.cc
index 8027487..d7c0160 100644
--- a/chrome/browser/local_discovery/privet_device_lister_unittest.cc
+++ b/chrome/browser/local_discovery/privet_device_lister_unittest.cc
@@ -117,9 +117,8 @@ class MockServiceDiscoveryClient : public ServiceDiscoveryClient {
   virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher(
       const std::string& service_type,
       const ServiceWatcher::UpdatedCallback& callback) override {
-    scoped_ptr<MockServiceWatcher> mock_service_watcher(
+    return make_scoped_ptr(
         new MockServiceWatcher(service_type, callback, mock_delegate_));
-    return mock_service_watcher.PassAs<ServiceWatcher>();
   }
 
   // Create a service resolver object for getting detailed service information
@@ -127,9 +126,8 @@ class MockServiceDiscoveryClient : public ServiceDiscoveryClient {
   virtual scoped_ptr<ServiceResolver> CreateServiceResolver(
       const std::string& service_name,
       const ServiceResolver::ResolveCompleteCallback& callback) override {
-    scoped_ptr<MockServiceResolver> mock_service_resolver(
+    return make_scoped_ptr(
         new MockServiceResolver(service_name, callback, mock_delegate_));
-    return mock_service_resolver.PassAs<ServiceResolver>();
   }
 
   // Not used in this test.
diff --git a/chrome/browser/local_discovery/privet_http_unittest.cc b/chrome/browser/local_discovery/privet_http_unittest.cc
index 1835024..44fbd24 100644
--- a/chrome/browser/local_discovery/privet_http_unittest.cc
+++ b/chrome/browser/local_discovery/privet_http_unittest.cc
@@ -798,7 +798,7 @@ class PrivetLocalPrintTest : public PrivetHTTPTest {
         new FakePWGRasterConverter);
     pwg_converter_ = pwg_converter.get();
     local_print_operation_->SetPWGRasterConverterForTesting(
-        pwg_converter.PassAs<PWGRasterConverter>());
+        pwg_converter.Pass());
   }
 
   scoped_refptr<base::RefCountedBytes> RefCountedBytesFromString(
diff --git a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc
index d25f982..5cf3e28 100644
--- a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc
+++ b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc
@@ -92,7 +92,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate {
       const PrivetClientCallback& callback) override {
     scoped_ptr<MockPrivetHTTPClient> privet_client(new MockPrivetHTTPClient());
     privet_client_ptr_ = privet_client.get();
-    callback.Run(privet_client.PassAs<PrivetHTTPClient>());
+    callback.Run(privet_client.Pass());
   }
   MOCK_METHOD2(ConfirmSecurityCode,
                void(const std::string&, const ResultCallback&));
@@ -101,8 +101,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate {
   MOCK_METHOD0(OnSetupError, void());
 
   virtual scoped_ptr<GCDApiFlow> CreateApiFlow() override {
-    scoped_ptr<MockGCDApiFlow> mock_gcd(new MockGCDApiFlow(this));
-    return mock_gcd.PassAs<GCDApiFlow>();
+    return make_scoped_ptr(new MockGCDApiFlow(this));
   }
 
   void ReplyWithToken() {
diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
index 4c904ef..3151354 100644
--- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
+++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
@@ -88,7 +88,7 @@ void MTPDeviceDelegateImplWinTest::SetUp() {
   TestingBrowserProcess* browser_process = TestingBrowserProcess::GetGlobal();
   DCHECK(browser_process);
   monitor_ = monitor.get();
-  StorageMonitor::SetStorageMonitorForTesting(monitor.PassAs<StorageMonitor>());
+  StorageMonitor::SetStorageMonitorForTesting(monitor.Pass());
 
   base::RunLoop runloop;
   browser_process->media_file_system_registry()->GetPreferences(profile())->