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

BUG=423621

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

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

chrome/installer/util/firewall_manager_win.cc

@@ -106,13 +106,13 @@ scoped_ptr<FirewallManager> FirewallManager::Create(
   scoped_ptr<FirewallManagerAdvancedImpl> manager(
       new FirewallManagerAdvancedImpl());
   if (manager->Init(dist->GetDisplayName(), chrome_path))
-    return manager.PassAs<FirewallManager>();
+    return manager.Pass();
 
   // Next try to connect to "Windows Firewall for Windows XP with SP2".
   scoped_ptr<FirewallManagerLegacyImpl> legacy_manager(
       new FirewallManagerLegacyImpl());
   if (legacy_manager->Init(dist->GetDisplayName(), chrome_path))
-    return legacy_manager.PassAs<FirewallManager>();
+    return legacy_manager.Pass();
 
   return scoped_ptr<FirewallManager>();
 }

chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc

@@ -193,7 +193,7 @@ class PhishingClassifierTest : public InProcessBrowserTest {
     http_response->set_code(net::HTTP_OK);
     http_response->set_content_type("text/html");
     http_response->set_content(response_content_);
-    return http_response.PassAs<net::test_server::HttpResponse>();
+    return http_response.Pass();
   }
 
   std::string response_content_;

chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc

@@ -215,7 +215,7 @@ class PhishingClassifierDelegateTest : public InProcessBrowserTest {
     http_response->set_code(net::HTTP_OK);
     http_response->set_content_type("text/html");
     http_response->set_content(response_content_);
-    return http_response.PassAs<net::test_server::HttpResponse>();
+    return http_response.Pass();
   }
 
   content::WebContents* GetWebContents() {

chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc

@@ -158,7 +158,7 @@ class PhishingDOMFeatureExtractorTest : public InProcessBrowserTest {
     http_response->set_code(net::HTTP_OK);
     http_response->set_content_type("text/html");
     http_response->set_content(it->second);
-    return http_response.PassAs<net::test_server::HttpResponse>();
+    return http_response.Pass();
   }
 
   GURL GetURL(const std::string& host, const std::string& path) {

chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc

@@ -1043,8 +1043,7 @@ class MockDevToolsEventListener : public DevToolsEventListener {
 
 scoped_ptr<SyncWebSocket> CreateMockSyncWebSocket6(
     std::list<std::string>* messages) {
-  return scoped_ptr<MockSyncWebSocket6>(new MockSyncWebSocket6(messages))
-      .PassAs<SyncWebSocket>();
+  return make_scoped_ptr(new MockSyncWebSocket6(messages));
 }
 
 }  // namespace

chrome/test/chromedriver/chrome/heap_snapshot_taker_unittest.cc

@@ -20,7 +20,7 @@ scoped_ptr<base::Value> GetSnapshotAsValue() {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetInteger("a", 1);
   dict->SetInteger("b", 2);
-  return dict.PassAs<base::Value>();
+  return dict.Pass();
 }
 
 class DummyDevToolsClient : public StubDevToolsClient {

chrome/test/chromedriver/chrome/log.cc

@@ -49,7 +49,7 @@ scoped_ptr<base::Value> SmartDeepCopy(const base::Value* value) {
       dict_copy->SetWithoutPathExpansion(it.key(),
                                          SmartDeepCopy(child).release());
     }
-    return dict_copy.PassAs<base::Value>();
+    return dict_copy.Pass();
   } else if (value->GetAsList(&list)) {
     scoped_ptr<base::ListValue> list_copy(new base::ListValue());
     for (size_t i = 0; i < list->GetSize(); ++i) {
@@ -62,7 +62,7 @@ scoped_ptr<base::Value> SmartDeepCopy(const base::Value* value) {
       }
       list_copy->Append(SmartDeepCopy(child).release());
     }
-    return list_copy.PassAs<base::Value>();
+    return list_copy.Pass();
   } else if (value->GetAsString(&data)) {
     TruncateString(&data);
     return scoped_ptr<base::Value>(new base::StringValue(data));

chrome/test/chromedriver/chrome/web_view_impl.cc

@@ -489,7 +489,7 @@ Status WebViewImpl::EndProfile(scoped_ptr<base::Value>* profile_data) {
     }
   }
 
-  *profile_data = profile_result.PassAs<base::Value>();
+  *profile_data = profile_result.Pass();
   return status;
 }
 

chrome/test/nacl/pnacl_header_test.cc

@@ -99,7 +99,7 @@ scoped_ptr<HttpResponse> PnaclHeaderTest::WatchForPexeFetch(
     http_response->set_code(net::HTTP_OK);
     http_response->set_content("");
     http_response->set_content_type("application/octet-stream");
-    return http_response.PassAs<HttpResponse>();
+    return http_response.Pass();
   }
 
   // Skip other non-pexe files and let ServeFilesFromDirectory handle it.
@@ -132,7 +132,7 @@ scoped_ptr<HttpResponse> PnaclHeaderTest::WatchForPexeFetch(
   http_response->set_code(net::HTTP_NOT_FOUND);
   http_response->set_content("PEXE ... not found");
   http_response->set_content_type("application/octet-stream");
-  return http_response.PassAs<HttpResponse>();
+  return http_response.Pass();
 }
 
 IN_PROC_BROWSER_TEST_F(PnaclHeaderTest, TestHasPnaclHeader) {