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
/
socket
/
websocket_endpoint_lock_manager_unittest.cc
diff --git
a/src/net/socket/websocket_endpoint_lock_manager_unittest.cc
b/src/net/socket/websocket_endpoint_lock_manager_unittest.cc
index
cfc6cc6
..
1626aa9
100644
(file)
--- a/
src/net/socket/websocket_endpoint_lock_manager_unittest.cc
+++ b/
src/net/socket/websocket_endpoint_lock_manager_unittest.cc
@@
-22,57
+22,51
@@
class FakeStreamSocket : public StreamSocket {
FakeStreamSocket() {}
// StreamSocket implementation
FakeStreamSocket() {}
// StreamSocket implementation
-
virtual int Connect(const CompletionCallback& callback) OVERRIDE
{
+
int Connect(const CompletionCallback& callback) override
{
return ERR_FAILED;
}
return ERR_FAILED;
}
- v
irtual void Disconnect() OVERRIDE
{ return; }
+ v
oid Disconnect() override
{ return; }
-
virtual bool IsConnected() const OVERRIDE
{ return false; }
+
bool IsConnected() const override
{ return false; }
-
virtual bool IsConnectedAndIdle() const OVERRIDE
{ return false; }
+
bool IsConnectedAndIdle() const override
{ return false; }
- virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE {
- return ERR_FAILED;
- }
+ int GetPeerAddress(IPEndPoint* address) const override { return ERR_FAILED; }
- virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE {
- return ERR_FAILED;
- }
+ int GetLocalAddress(IPEndPoint* address) const override { return ERR_FAILED; }
-
virtual const BoundNetLog& NetLog() const OVERRIDE
{ return bound_net_log_; }
+
const BoundNetLog& NetLog() const override
{ return bound_net_log_; }
- v
irtual void SetSubresourceSpeculation() OVERRIDE
{ return; }
- v
irtual void SetOmniboxSpeculation() OVERRIDE
{ return; }
+ v
oid SetSubresourceSpeculation() override
{ return; }
+ v
oid SetOmniboxSpeculation() override
{ return; }
-
virtual bool WasEverUsed() const OVERRIDE
{ return false; }
+
bool WasEverUsed() const override
{ return false; }
-
virtual bool UsingTCPFastOpen() const OVERRIDE
{ return false; }
+
bool UsingTCPFastOpen() const override
{ return false; }
-
virtual bool WasNpnNegotiated() const OVERRIDE
{ return false; }
+
bool WasNpnNegotiated() const override
{ return false; }
- virtual NextProto GetNegotiatedProtocol() const OVERRIDE {
- return kProtoUnknown;
- }
+ NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; }
-
virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE
{ return false; }
+
bool GetSSLInfo(SSLInfo* ssl_info) override
{ return false; }
// Socket implementation
// Socket implementation
-
virtual
int Read(IOBuffer* buf,
-
int buf_len,
-
const CompletionCallback& callback) OVERRIDE
{
+ int Read(IOBuffer* buf,
+ int buf_len,
+
const CompletionCallback& callback) override
{
return ERR_FAILED;
}
return ERR_FAILED;
}
-
virtual
int Write(IOBuffer* buf,
-
int buf_len,
-
const CompletionCallback& callback) OVERRIDE
{
+ int Write(IOBuffer* buf,
+ int buf_len,
+
const CompletionCallback& callback) override
{
return ERR_FAILED;
}
return ERR_FAILED;
}
-
virtual int SetReceiveBufferSize(int32 size) OVERRIDE
{ return ERR_FAILED; }
+
int SetReceiveBufferSize(int32 size) override
{ return ERR_FAILED; }
-
virtual int SetSendBufferSize(int32 size) OVERRIDE
{ return ERR_FAILED; }
+
int SetSendBufferSize(int32 size) override
{ return ERR_FAILED; }
private:
BoundNetLog bound_net_log_;
private:
BoundNetLog bound_net_log_;
@@
-84,7
+78,7
@@
class FakeWaiter : public WebSocketEndpointLockManager::Waiter {
public:
FakeWaiter() : called_(false) {}
public:
FakeWaiter() : called_(false) {}
- v
irtual void GotEndpointLock() OVERRIDE
{
+ v
oid GotEndpointLock() override
{
CHECK(!called_);
called_ = true;
}
CHECK(!called_);
called_ = true;
}
@@
-99,7
+93,7
@@
class WebSocketEndpointLockManagerTest : public ::testing::Test {
protected:
WebSocketEndpointLockManagerTest()
: instance_(WebSocketEndpointLockManager::GetInstance()) {}
protected:
WebSocketEndpointLockManagerTest()
: instance_(WebSocketEndpointLockManager::GetInstance()) {}
-
virtual ~WebSocketEndpointLockManagerTest()
{
+
~WebSocketEndpointLockManagerTest() override
{
// If this check fails then subsequent tests may fail.
CHECK(instance_->IsEmpty());
}
// If this check fails then subsequent tests may fail.
CHECK(instance_->IsEmpty());
}