X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fjingle%2Fglue%2Fchrome_async_socket.h;h=3ce97a4f57421d48662f5fbd9e44e1d4884eed75;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=18c83cabb160ab61d177f042b9f6135bfa3be4ec;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/jingle/glue/chrome_async_socket.h b/src/jingle/glue/chrome_async_socket.h
index 18c83ca..3ce97a4 100644
--- a/src/jingle/glue/chrome_async_socket.h
+++ b/src/jingle/glue/chrome_async_socket.h
@@ -21,7 +21,7 @@
 #include "base/memory/weak_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "third_party/libjingle/source/talk/xmpp/asyncsocket.h"
+#include "third_party/webrtc/libjingle/xmpp/asyncsocket.h"
 
 namespace net {
 class IOBufferWithSize;
@@ -41,22 +41,22 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
       size_t write_buf_size);
 
   // Does not raise any signals.
-  virtual ~ChromeAsyncSocket();
+  ~ChromeAsyncSocket() override;
 
   // buzz::AsyncSocket implementation.
 
   // The current state (see buzz::AsyncSocket::State; all but
   // STATE_CLOSING is used).
-  virtual State state() OVERRIDE;
+  State state() override;
 
   // The last generated error.  Errors are generated when the main
   // functions below return false or when SignalClosed is raised due
   // to an asynchronous error.
-  virtual Error error() OVERRIDE;
+  Error error() override;
 
   // GetError() (which is of type net::Error) != net::OK only when
   // error() == ERROR_WINSOCK.
-  virtual int GetError() OVERRIDE;
+  int GetError() override;
 
   // Tries to connect to the given address.
   //
@@ -72,7 +72,7 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
   // Otherwise, starts the connection process and returns true.
   // SignalConnected will be raised when the connection is successful;
   // otherwise, SignalClosed will be raised with a net error set.
-  virtual bool Connect(const rtc::SocketAddress& address) OVERRIDE;
+  bool Connect(const rtc::SocketAddress& address) override;
 
   // Tries to read at most |len| bytes into |data|.
   //
@@ -85,7 +85,7 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
   // case because StartTls() is called during a slot connected to
   // SignalRead after parsing the final non-TLS reply from the server
   // [see XmppClient::Private::OnSocketRead()].)
-  virtual bool Read(char* data, size_t len, size_t* len_read) OVERRIDE;
+  bool Read(char* data, size_t len, size_t* len_read) override;
 
   // Queues up |len| bytes of |data| for writing.
   //
@@ -104,11 +104,11 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
   // Note that there's no guarantee that the data will actually be
   // sent; however, it is guaranteed that the any data sent will be
   // sent in FIFO order.
-  virtual bool Write(const char* data, size_t len) OVERRIDE;
+  bool Write(const char* data, size_t len) override;
 
   // If the socket is not already closed, closes the socket and raises
   // SignalClosed.  Always returns true.
-  virtual bool Close() OVERRIDE;
+  bool Close() override;
 
   // Tries to change to a TLS connection with the given domain name.
   //
@@ -121,7 +121,7 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
   // SignalSSLConnected will be raised when the connection is
   // successful; otherwise, SignalClosed will be raised with a net
   // error set.
-  virtual bool StartTls(const std::string& domain_name) OVERRIDE;
+  bool StartTls(const std::string& domain_name) override;
 
   // Signal behavior:
   //