diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/dns/dns_transaction.cc | |
parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/dns/dns_transaction.cc')
-rw-r--r-- | chromium/net/dns/dns_transaction.cc | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/chromium/net/dns/dns_transaction.cc b/chromium/net/dns/dns_transaction.cc index f726bd21c52..a3aa8e12e67 100644 --- a/chromium/net/dns/dns_transaction.cc +++ b/chromium/net/dns/dns_transaction.cc @@ -5,6 +5,7 @@ #include "net/dns/dns_transaction.h" #include <deque> +#include <memory> #include <string> #include <utility> #include <vector> @@ -13,8 +14,8 @@ #include "base/bind.h" #include "base/location.h" #include "base/macros.h" +#include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" #include "base/profiler/scoped_tracker.h" @@ -22,8 +23,8 @@ #include "base/single_thread_task_runner.h" #include "base/stl_util.h" #include "base/strings/string_piece.h" -#include "base/thread_task_runner_handle.h" #include "base/threading/non_thread_safe.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/timer/timer.h" #include "base/values.h" #include "net/base/completion_callback.h" @@ -62,11 +63,11 @@ bool IsIPLiteral(const std::string& hostname) { return ip.AssignFromIPLiteral(hostname); } -scoped_ptr<base::Value> NetLogStartCallback( +std::unique_ptr<base::Value> NetLogStartCallback( const std::string* hostname, uint16_t qtype, NetLogCaptureMode /* capture_mode */) { - scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); + std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); dict->SetString("hostname", *hostname); dict->SetInteger("query_type", qtype); return std::move(dict); @@ -103,11 +104,11 @@ class DnsAttempt { // Returns a Value representing the received response, along with a reference // to the NetLog source source of the UDP socket used. The request must have // completed before this is called. - scoped_ptr<base::Value> NetLogResponseCallback( + std::unique_ptr<base::Value> NetLogResponseCallback( NetLogCaptureMode capture_mode) const { DCHECK(GetResponse()->IsValid()); - scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); + std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); dict->SetInteger("rcode", GetResponse()->rcode()); dict->SetInteger("answer_count", GetResponse()->answer_count()); GetSocketNetLog().source().AddToEventParameters(dict.get()); @@ -139,8 +140,8 @@ class DnsAttempt { class DnsUDPAttempt : public DnsAttempt { public: DnsUDPAttempt(unsigned server_index, - scoped_ptr<DnsSession::SocketLease> socket_lease, - scoped_ptr<DnsQuery> query) + std::unique_ptr<DnsSession::SocketLease> socket_lease, + std::unique_ptr<DnsQuery> query) : DnsAttempt(server_index), next_state_(STATE_NONE), received_malformed_response_(false), @@ -288,10 +289,10 @@ class DnsUDPAttempt : public DnsAttempt { bool received_malformed_response_; base::TimeTicks start_time_; - scoped_ptr<DnsSession::SocketLease> socket_lease_; - scoped_ptr<DnsQuery> query_; + std::unique_ptr<DnsSession::SocketLease> socket_lease_; + std::unique_ptr<DnsQuery> query_; - scoped_ptr<DnsResponse> response_; + std::unique_ptr<DnsResponse> response_; CompletionCallback callback_; @@ -301,8 +302,8 @@ class DnsUDPAttempt : public DnsAttempt { class DnsTCPAttempt : public DnsAttempt { public: DnsTCPAttempt(unsigned server_index, - scoped_ptr<StreamSocket> socket, - scoped_ptr<DnsQuery> query) + std::unique_ptr<StreamSocket> socket, + std::unique_ptr<DnsQuery> query) : DnsAttempt(server_index), next_state_(STATE_NONE), socket_(std::move(socket)), @@ -532,13 +533,13 @@ class DnsTCPAttempt : public DnsAttempt { State next_state_; base::TimeTicks start_time_; - scoped_ptr<StreamSocket> socket_; - scoped_ptr<DnsQuery> query_; + std::unique_ptr<StreamSocket> socket_; + std::unique_ptr<DnsQuery> query_; scoped_refptr<IOBufferWithSize> length_buffer_; scoped_refptr<DrainableIOBuffer> buffer_; uint16_t response_length_; - scoped_ptr<DnsResponse> response_; + std::unique_ptr<DnsResponse> response_; CompletionCallback callback_; @@ -706,7 +707,7 @@ class DnsTransactionImpl : public DnsTransaction, unsigned attempt_number = attempts_.size(); uint16_t id = session_->NextQueryId(); - scoped_ptr<DnsQuery> query; + std::unique_ptr<DnsQuery> query; if (attempts_.empty()) { query.reset(new DnsQuery(id, qnames_.front(), qtype_)); } else { @@ -720,7 +721,7 @@ class DnsTransactionImpl : public DnsTransaction, // Skip over known failed servers. server_index = session_->NextGoodServerIndex(server_index); - scoped_ptr<DnsSession::SocketLease> lease = + std::unique_ptr<DnsSession::SocketLease> lease = session_->AllocateSocket(server_index, net_log_.source()); bool got_socket = !!lease.get(); @@ -728,7 +729,7 @@ class DnsTransactionImpl : public DnsTransaction, DnsUDPAttempt* attempt = new DnsUDPAttempt(server_index, std::move(lease), std::move(query)); - attempts_.push_back(make_scoped_ptr(attempt)); + attempts_.push_back(base::WrapUnique(attempt)); ++attempts_count_; if (!got_socket) @@ -756,12 +757,12 @@ class DnsTransactionImpl : public DnsTransaction, unsigned server_index = previous_attempt->server_index(); - scoped_ptr<StreamSocket> socket( + std::unique_ptr<StreamSocket> socket( session_->CreateTCPSocket(server_index, net_log_.source())); // TODO(szym): Reuse the same id to help the server? uint16_t id = session_->NextQueryId(); - scoped_ptr<DnsQuery> query = + std::unique_ptr<DnsQuery> query = previous_attempt->GetQuery()->CloneWithNewId(id); RecordLostPacketsIfAny(); @@ -773,7 +774,7 @@ class DnsTransactionImpl : public DnsTransaction, DnsTCPAttempt* attempt = new DnsTCPAttempt(server_index, std::move(socket), std::move(query)); - attempts_.push_back(make_scoped_ptr(attempt)); + attempts_.push_back(base::WrapUnique(attempt)); ++attempts_count_; had_tcp_attempt_ = true; @@ -955,7 +956,7 @@ class DnsTransactionImpl : public DnsTransaction, size_t qnames_initial_size_; // List of attempts for the current name. - std::vector<scoped_ptr<DnsAttempt>> attempts_; + std::vector<std::unique_ptr<DnsAttempt>> attempts_; // Count of attempts, not reset when |attempts_| vector is cleared. int attempts_count_; bool had_tcp_attempt_; @@ -978,12 +979,12 @@ class DnsTransactionFactoryImpl : public DnsTransactionFactory { session_ = session; } - scoped_ptr<DnsTransaction> CreateTransaction( + std::unique_ptr<DnsTransaction> CreateTransaction( const std::string& hostname, uint16_t qtype, const CallbackType& callback, const BoundNetLog& net_log) override { - return scoped_ptr<DnsTransaction>(new DnsTransactionImpl( + return std::unique_ptr<DnsTransaction>(new DnsTransactionImpl( session_.get(), hostname, qtype, callback, net_log)); } @@ -994,9 +995,9 @@ class DnsTransactionFactoryImpl : public DnsTransactionFactory { } // namespace // static -scoped_ptr<DnsTransactionFactory> DnsTransactionFactory::CreateFactory( +std::unique_ptr<DnsTransactionFactory> DnsTransactionFactory::CreateFactory( DnsSession* session) { - return scoped_ptr<DnsTransactionFactory>( + return std::unique_ptr<DnsTransactionFactory>( new DnsTransactionFactoryImpl(session)); } |