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

chrome/browser/local_discovery/privet_device_lister_unittest.cc

Index: chrome/browser/local_discovery/privet_device_lister_unittest.cc
diff --git a/chrome/browser/local_discovery/privet_device_lister_unittest.cc b/chrome/browser/local_discovery/privet_device_lister_unittest.cc
index 80274877a5202391c6252350040a1dc96a6fe3b1..d7c016039c11e697d39a959da5bbf1987d3855ac 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.