diff options
| author | dcheng <dcheng@chromium.org> | 2014-10-15 12:30:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-15 19:31:14 +0000 |
| commit | e3d1ddcf059c2c22577489e5235fb1cbafd29e88 (patch) | |
| tree | 76ad2e4e25fe1ac2356e84a4570e1291d84acb75 /net/dns | |
| parent | e68c7cde5e8169649631ebe247d20447261d69f7 (diff) | |
| download | chromium_src-e3d1ddcf059c2c22577489e5235fb1cbafd29e88.zip chromium_src-e3d1ddcf059c2c22577489e5235fb1cbafd29e88.tar.gz chromium_src-e3d1ddcf059c2c22577489e5235fb1cbafd29e88.tar.bz2 | |
Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.
BUG=423621
Review URL: https://codereview.chromium.org/657013003
Cr-Commit-Position: refs/heads/master@{#299741}
Diffstat (limited to 'net/dns')
| -rw-r--r-- | net/dns/dns_session_unittest.cc | 2 | ||||
| -rw-r--r-- | net/dns/dns_transaction_unittest.cc | 2 | ||||
| -rw-r--r-- | net/dns/mapped_host_resolver_unittest.cc | 8 | ||||
| -rw-r--r-- | net/dns/mdns_client.cc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/net/dns/dns_session_unittest.cc b/net/dns/dns_session_unittest.cc index e6f1230..166abef 100644 --- a/net/dns/dns_session_unittest.cc +++ b/net/dns/dns_session_unittest.cc @@ -194,7 +194,7 @@ TestClientSocketFactory::CreateDatagramClientSocket( scoped_ptr<MockUDPClientSocket> socket( new MockUDPClientSocket(data_provider, net_log)); data_provider->set_socket(socket.get()); - return socket.PassAs<DatagramClientSocket>(); + return socket.Pass(); } TestClientSocketFactory::~TestClientSocketFactory() { diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc index 908f915..e074966 100644 --- a/net/dns/dns_transaction_unittest.cc +++ b/net/dns/dns_transaction_unittest.cc @@ -198,7 +198,7 @@ class TestSocketFactory : public MockClientSocketFactory { scoped_ptr<TestUDPClientSocket> socket( new TestUDPClientSocket(this, data_provider, net_log)); data_provider->set_socket(socket.get()); - return socket.PassAs<DatagramClientSocket>(); + return socket.Pass(); } void OnConnect(const IPEndPoint& endpoint) { diff --git a/net/dns/mapped_host_resolver_unittest.cc b/net/dns/mapped_host_resolver_unittest.cc index fbbfde8..05cde24 100644 --- a/net/dns/mapped_host_resolver_unittest.cc +++ b/net/dns/mapped_host_resolver_unittest.cc @@ -32,7 +32,7 @@ TEST(MappedHostResolverTest, Inclusion) { // Create a remapped resolver that uses |resolver_impl|. scoped_ptr<MappedHostResolver> resolver( - new MappedHostResolver(resolver_impl.PassAs<HostResolver>())); + new MappedHostResolver(resolver_impl.Pass())); int rv; AddressList address_list; @@ -106,7 +106,7 @@ TEST(MappedHostResolverTest, Exclusion) { // Create a remapped resolver that uses |resolver_impl|. scoped_ptr<MappedHostResolver> resolver( - new MappedHostResolver(resolver_impl.PassAs<HostResolver>())); + new MappedHostResolver(resolver_impl.Pass())); int rv; AddressList address_list; @@ -153,7 +153,7 @@ TEST(MappedHostResolverTest, SetRulesFromString) { // Create a remapped resolver that uses |resolver_impl|. scoped_ptr<MappedHostResolver> resolver( - new MappedHostResolver(resolver_impl.PassAs<HostResolver>())); + new MappedHostResolver(resolver_impl.Pass())); int rv; AddressList address_list; @@ -210,7 +210,7 @@ TEST(MappedHostResolverTest, MapToError) { resolver_impl->rules()->AddRule("*", "192.168.1.5"); scoped_ptr<MappedHostResolver> resolver( - new MappedHostResolver(resolver_impl.PassAs<HostResolver>())); + new MappedHostResolver(resolver_impl.Pass())); int rv; AddressList address_list; diff --git a/net/dns/mdns_client.cc b/net/dns/mdns_client.cc index c55de6e..ac00352 100644 --- a/net/dns/mdns_client.cc +++ b/net/dns/mdns_client.cc @@ -96,7 +96,7 @@ scoped_ptr<DatagramServerSocket> CreateAndBindMDnsSocket( VLOG(1) << "Bind failed, endpoint=" << multicast_addr.ToStringWithoutPort() << ", error=" << rv; } - return socket.PassAs<DatagramServerSocket>(); + return socket.Pass(); } } // namespace net |