projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
net
/
dns
/
dns_transaction.cc
diff --git
a/src/net/dns/dns_transaction.cc
b/src/net/dns/dns_transaction.cc
index
0424d48
..
03eb7f2
100644
(file)
--- a/
src/net/dns/dns_transaction.cc
+++ b/
src/net/dns/dns_transaction.cc
@@
-141,7
+141,7
@@
class DnsUDPAttempt : public DnsAttempt {
query_(query.Pass()) {}
// DnsAttempt:
query_(query.Pass()) {}
// DnsAttempt:
-
virtual int Start(const CompletionCallback& callback) OVERRIDE
{
+
int Start(const CompletionCallback& callback) override
{
DCHECK_EQ(STATE_NONE, next_state_);
callback_ = callback;
start_time_ = base::TimeTicks::Now();
DCHECK_EQ(STATE_NONE, next_state_);
callback_ = callback;
start_time_ = base::TimeTicks::Now();
@@
-149,16
+149,14
@@
class DnsUDPAttempt : public DnsAttempt {
return DoLoop(OK);
}
return DoLoop(OK);
}
- virtual const DnsQuery* GetQuery() const OVERRIDE {
- return query_.get();
- }
+ const DnsQuery* GetQuery() const override { return query_.get(); }
-
virtual const DnsResponse* GetResponse() const OVERRIDE
{
+
const DnsResponse* GetResponse() const override
{
const DnsResponse* resp = response_.get();
return (resp != NULL && resp->IsValid()) ? resp : NULL;
}
const DnsResponse* resp = response_.get();
return (resp != NULL && resp->IsValid()) ? resp : NULL;
}
-
virtual const BoundNetLog& GetSocketNetLog() const OVERRIDE
{
+
const BoundNetLog& GetSocketNetLog() const override
{
return socket_lease_->socket()->NetLog();
}
return socket_lease_->socket()->NetLog();
}
@@
-306,7
+304,7
@@
class DnsTCPAttempt : public DnsAttempt {
response_length_(0) {}
// DnsAttempt:
response_length_(0) {}
// DnsAttempt:
-
virtual int Start(const CompletionCallback& callback) OVERRIDE
{
+
int Start(const CompletionCallback& callback) override
{
DCHECK_EQ(STATE_NONE, next_state_);
callback_ = callback;
start_time_ = base::TimeTicks::Now();
DCHECK_EQ(STATE_NONE, next_state_);
callback_ = callback;
start_time_ = base::TimeTicks::Now();
@@
-320,16
+318,14
@@
class DnsTCPAttempt : public DnsAttempt {
return DoLoop(rv);
}
return DoLoop(rv);
}
- virtual const DnsQuery* GetQuery() const OVERRIDE {
- return query_.get();
- }
+ const DnsQuery* GetQuery() const override { return query_.get(); }
-
virtual const DnsResponse* GetResponse() const OVERRIDE
{
+
const DnsResponse* GetResponse() const override
{
const DnsResponse* resp = response_.get();
return (resp != NULL && resp->IsValid()) ? resp : NULL;
}
const DnsResponse* resp = response_.get();
return (resp != NULL && resp->IsValid()) ? resp : NULL;
}
-
virtual const BoundNetLog& GetSocketNetLog() const OVERRIDE
{
+
const BoundNetLog& GetSocketNetLog() const override
{
return socket_->NetLog();
}
return socket_->NetLog();
}
@@
-567,24
+563,24
@@
class DnsTransactionImpl : public DnsTransaction,
DCHECK(!IsIPLiteral(hostname_));
}
DCHECK(!IsIPLiteral(hostname_));
}
-
virtual ~DnsTransactionImpl()
{
+
~DnsTransactionImpl() override
{
if (!callback_.is_null()) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_DNS_TRANSACTION,
ERR_ABORTED);
} // otherwise logged in DoCallback or Start
}
if (!callback_.is_null()) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_DNS_TRANSACTION,
ERR_ABORTED);
} // otherwise logged in DoCallback or Start
}
-
virtual const std::string& GetHostname() const OVERRIDE
{
+
const std::string& GetHostname() const override
{
DCHECK(CalledOnValidThread());
return hostname_;
}
DCHECK(CalledOnValidThread());
return hostname_;
}
-
virtual uint16 GetType() const OVERRIDE
{
+
uint16 GetType() const override
{
DCHECK(CalledOnValidThread());
return qtype_;
}
DCHECK(CalledOnValidThread());
return qtype_;
}
- v
irtual void Start() OVERRIDE
{
+ v
oid Start() override
{
DCHECK(!callback_.is_null());
DCHECK(attempts_.empty());
net_log_.BeginEvent(NetLog::TYPE_DNS_TRANSACTION,
DCHECK(!callback_.is_null());
DCHECK(attempts_.empty());
net_log_.BeginEvent(NetLog::TYPE_DNS_TRANSACTION,
@@
-968,11
+964,11
@@
class DnsTransactionFactoryImpl : public DnsTransactionFactory {
session_ = session;
}
session_ = session;
}
-
virtual
scoped_ptr<DnsTransaction> CreateTransaction(
+ scoped_ptr<DnsTransaction> CreateTransaction(
const std::string& hostname,
uint16 qtype,
const CallbackType& callback,
const std::string& hostname,
uint16 qtype,
const CallbackType& callback,
- const BoundNetLog& net_log)
OVERRIDE
{
+ const BoundNetLog& net_log)
override
{
return scoped_ptr<DnsTransaction>(new DnsTransactionImpl(
session_.get(), hostname, qtype, callback, net_log));
}
return scoped_ptr<DnsTransaction>(new DnsTransactionImpl(
session_.get(), hostname, qtype, callback, net_log));
}