summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhari.singh1 <hari.singh1@samsung.com>2015-05-26 21:26:45 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-27 04:27:20 +0000
commitbc615d387a017d60aff03f0fac9ea47572733b04 (patch)
tree33571a93e83a990a5d3067a60d696e094ec09a57
parente100f113e5db9c9ac844f7c1e7941915e6799236 (diff)
downloadchromium_src-bc615d387a017d60aff03f0fac9ea47572733b04.zip
chromium_src-bc615d387a017d60aff03f0fac9ea47572733b04.tar.gz
chromium_src-bc615d387a017d60aff03f0fac9ea47572733b04.tar.bz2
Subsituting pattern ScopedVector push_back.(ptr.release()) with push_back(ptr.Pass()) in net/dns
BUG=457697 Review URL: https://codereview.chromium.org/1147903003 Cr-Commit-Position: refs/heads/master@{#331528}
-rw-r--r--AUTHORS1
-rw-r--r--net/dns/address_sorter_posix.cc2
-rw-r--r--net/dns/dns_transaction_unittest.cc8
-rw-r--r--net/dns/host_resolver_impl.cc2
-rw-r--r--net/dns/host_resolver_mojo_unittest.cc2
-rw-r--r--net/dns/mdns_client_impl.cc2
-rw-r--r--net/dns/mock_mdns_socket_factory.cc2
7 files changed, 10 insertions, 9 deletions
diff --git a/AUTHORS b/AUTHORS
index 84b60f1..18a987c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -197,6 +197,7 @@ Haitao Feng <haitao.feng@intel.com>
Halton Huo <halton.huo@intel.com>
Haojian Wu <hokein.wu@gmail.com>
Harpreet Singh Khurana <harpreet.sk@samsung.com>
+Hari Singh <hari.singh1@samsung.com>
Harshikesh Kumar <harshikeshnobug@gmail.com>
Hautio Kari <khautio@gmail.com>
Heejin R. Chung <heejin.r.chung@samsung.com>
diff --git a/net/dns/address_sorter_posix.cc b/net/dns/address_sorter_posix.cc
index 5e2fe94..de50e4d 100644
--- a/net/dns/address_sorter_posix.cc
+++ b/net/dns/address_sorter_posix.cc
@@ -303,7 +303,7 @@ void AddressSorterPosix::Sort(const AddressList& list,
CommonPrefixLength(info->address, src.address()),
info->src->prefix_length);
}
- sort_list.push_back(info.release());
+ sort_list.push_back(info.Pass());
}
std::stable_sort(sort_list.begin(), sort_list.end(), CompareDestinations);
diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc
index 800e394..f5a8973 100644
--- a/net/dns/dns_transaction_unittest.cc
+++ b/net/dns/dns_transaction_unittest.cc
@@ -47,7 +47,7 @@ class DnsSocketData {
writes_.push_back(MockWrite(mode,
reinterpret_cast<const char*>(length.get()),
sizeof(uint16), num_reads_and_writes()));
- lengths_.push_back(length.release());
+ lengths_.push_back(length.Pass());
}
writes_.push_back(MockWrite(mode, query_->io_buffer()->data(),
query_->io_buffer()->size(),
@@ -67,12 +67,12 @@ class DnsSocketData {
reads_.push_back(MockRead(mode,
reinterpret_cast<const char*>(length.get()),
sizeof(uint16), num_reads_and_writes()));
- lengths_.push_back(length.release());
+ lengths_.push_back(length.Pass());
}
reads_.push_back(MockRead(mode, response->io_buffer()->data(),
response->io_buffer()->size(),
num_reads_and_writes()));
- responses_.push_back(response.release());
+ responses_.push_back(response.Pass());
}
// Adds pre-built DnsResponse.
@@ -359,7 +359,7 @@ class DnsTransactionTest : public testing::Test {
CHECK(socket_factory_.get());
transaction_ids_.push_back(data->query_id());
socket_factory_->AddSocketDataProvider(data->GetProvider());
- socket_data_.push_back(data.release());
+ socket_data_.push_back(data.Pass());
}
// Add expected query for |dotted_name| and |qtype| with |id| and response
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 3a04df1..cbda457 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -1336,7 +1336,7 @@ class HostResolverImpl::Job : public PrioritizedDispatcher::Job,
proc_task_->set_had_non_speculative_request();
}
- requests_.push_back(req.release());
+ requests_.push_back(req.Pass());
UpdatePriority();
}
diff --git a/net/dns/host_resolver_mojo_unittest.cc b/net/dns/host_resolver_mojo_unittest.cc
index bccb352..7271392 100644
--- a/net/dns/host_resolver_mojo_unittest.cc
+++ b/net/dns/host_resolver_mojo_unittest.cc
@@ -133,7 +133,7 @@ void MockMojoHostResolver::OnConnectionError() {
}
void MockMojoHostResolver::AddAction(scoped_ptr<HostResolverAction> action) {
- actions_.push_back(action.release());
+ actions_.push_back(action.Pass());
}
void MockMojoHostResolver::Resolve(
diff --git a/net/dns/mdns_client_impl.cc b/net/dns/mdns_client_impl.cc
index ac13bf5..b4cae7c 100644
--- a/net/dns/mdns_client_impl.cc
+++ b/net/dns/mdns_client_impl.cc
@@ -50,7 +50,7 @@ void MDnsSocketFactoryImpl::CreateSockets(
scoped_ptr<DatagramServerSocket> socket(
CreateAndBindMDnsSocket(interfaces[i].second, interfaces[i].first));
if (socket)
- sockets->push_back(socket.release());
+ sockets->push_back(socket.Pass());
}
}
diff --git a/net/dns/mock_mdns_socket_factory.cc b/net/dns/mock_mdns_socket_factory.cc
index 0bb8c54..681d1ec 100644
--- a/net/dns/mock_mdns_socket_factory.cc
+++ b/net/dns/mock_mdns_socket_factory.cc
@@ -82,7 +82,7 @@ void MockMDnsSocketFactory::CreateSocket(
this,
&MockMDnsSocketFactory::RecvFromInternal));
- sockets->push_back(new_socket.release());
+ sockets->push_back(new_socket.Pass());
}
void MockMDnsSocketFactory::SimulateReceive(const uint8* packet, int size) {