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

Cleanup to make future migration to std::move() easier.

BUG=423621

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

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

4 files changed, 7 insertions, 9 deletions

diff --git a/chromecast/browser/url_request_context_factory.cc b/chromecast/browser/url_request_context_factory.cc
index e2653a7..77d77f3 100644
--- a/chromecast/browser/url_request_context_factory.cc
+++ b/chromecast/browser/url_request_context_factory.cc
@@ -255,8 +255,7 @@ void URLRequestContextFactory::InitializeMainContextDependencies(
 #endif  // defined(OS_ANDROID)
 
   // Set up interceptors in the reverse order.
-  scoped_ptr<net::URLRequestJobFactory> top_job_factory =
-      job_factory.PassAs<net::URLRequestJobFactory>();
+  scoped_ptr<net::URLRequestJobFactory> top_job_factory = job_factory.Pass();
   for (content::URLRequestInterceptorScopedVector::reverse_iterator i =
            request_interceptors.rbegin();
        i != request_interceptors.rend();
diff --git a/components/policy/core/common/registry_dict_win.cc b/components/policy/core/common/registry_dict_win.cc
index 3da5622..964a83f 100644
--- a/components/policy/core/common/registry_dict_win.cc
+++ b/components/policy/core/common/registry_dict_win.cc
@@ -53,9 +53,9 @@ scoped_ptr<base::Value> ConvertValue(const base::Value& value,
         if (converted)
           result->Append(converted.release());
       }
-      return result.PassAs<base::Value>();
+      return result.Pass();
     }
-    return make_scoped_ptr(value.DeepCopy()).Pass();
+    return make_scoped_ptr(value.DeepCopy());
   }
 
   // Else, do some conversions to map windows registry data types to JSON types.
@@ -108,7 +108,7 @@ scoped_ptr<base::Value> ConvertValue(const base::Value& value,
           if (converted)
             result->Append(converted.release());
         }
-        return result.PassAs<base::Value>();
+        return result.Pass();
       }
       // Fall through in order to accept lists encoded as JSON strings.
     }
diff --git a/device/test/usb_test_gadget_impl.cc b/device/test/usb_test_gadget_impl.cc
index 56a4ac92..5fa8e9f 100644
--- a/device/test/usb_test_gadget_impl.cc
+++ b/device/test/usb_test_gadget_impl.cc
@@ -141,7 +141,7 @@ scoped_ptr<UsbTestGadget> UsbTestGadget::Claim() {
   VLOG(1) << "It took " << (kClaimRetries - retries)
           << " retries to find an unclaimed device.";
 
-  return gadget.PassAs<UsbTestGadget>();
+  return gadget.Pass();
 }
 
 UsbTestGadgetImpl::UsbTestGadgetImpl() {
@@ -181,7 +181,7 @@ scoped_ptr<net::URLFetcher> UsbTestGadgetImpl::CreateURLFetcher(
           request_context_.get(),
           base::MessageLoop::current()->message_loop_proxy()));
 
-  return url_fetcher.PassAs<net::URLFetcher>();
+  return url_fetcher;
 }
 
 int UsbTestGadgetImpl::SimplePOSTRequest(const GURL& url,
diff --git a/jingle/glue/fake_ssl_client_socket_unittest.cc b/jingle/glue/fake_ssl_client_socket_unittest.cc
index a2981eb..3a9a5cf 100644
--- a/jingle/glue/fake_ssl_client_socket_unittest.cc
+++ b/jingle/glue/fake_ssl_client_socket_unittest.cc
@@ -284,8 +284,7 @@ TEST_F(FakeSSLClientSocketTest, PassThroughMethods) {
   EXPECT_CALL(*mock_client_socket, SetOmniboxSpeculation());
 
   // Takes ownership of |mock_client_socket|.
-  FakeSSLClientSocket fake_ssl_client_socket(
-      mock_client_socket.PassAs<net::StreamSocket>());
+  FakeSSLClientSocket fake_ssl_client_socket(mock_client_socket.Pass());
   fake_ssl_client_socket.SetReceiveBufferSize(kReceiveBufferSize);
   fake_ssl_client_socket.SetSendBufferSize(kSendBufferSize);
   EXPECT_EQ(kPeerAddress,