Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / extensions / browser / api / socket / socket_api.h

diff --git a/src/extensions/browser/api/socket/socket_api.h b/src/extensions/browser/api/socket/socket_api.h
index 007f443..8ceee16 100644 (file)
--- a/src/extensions/browser/api/socket/socket_api.h
+++ b/src/extensions/browser/api/socket/socket_api.h
@@ -58,7 +58,7 @@ class SocketResourceManager : public SocketResourceManagerInterface {
  public:
   SocketResourceManager() : manager_(NULL) {}
 
-  virtual bool SetBrowserContext(content::BrowserContext* context) OVERRIDE {
+  virtual bool SetBrowserContext(content::BrowserContext* context) override {
     manager_ = ApiResourceManager<T>::Get(context);
     DCHECK(manager_)
         << "There is no socket manager. "
@@ -68,29 +68,29 @@ class SocketResourceManager : public SocketResourceManagerInterface {
     return manager_ != NULL;
   }
 
-  virtual int Add(Socket* socket) OVERRIDE {
+  virtual int Add(Socket* socket) override {
     // Note: Cast needed here, because "T" may be a subclass of "Socket".
     return manager_->Add(static_cast<T*>(socket));
   }
 
   virtual Socket* Get(const std::string& extension_id,
-                      int api_resource_id) OVERRIDE {
+                      int api_resource_id) override {
     return manager_->Get(extension_id, api_resource_id);
   }
 
   virtual void Replace(const std::string& extension_id,
                        int api_resource_id,
-                       Socket* socket) OVERRIDE {
+                       Socket* socket) override {
     manager_->Replace(extension_id, api_resource_id, static_cast<T*>(socket));
   }
 
   virtual void Remove(const std::string& extension_id,
-                      int api_resource_id) OVERRIDE {
+                      int api_resource_id) override {
     manager_->Remove(extension_id, api_resource_id);
   }
 
   virtual base::hash_set<int>* GetResourceIds(const std::string& extension_id)
-      OVERRIDE {
+      override {
     return manager_->GetResourceIds(extension_id);
   }
 
@@ -103,11 +103,11 @@ class SocketAsyncApiFunction : public AsyncApiFunction {
   SocketAsyncApiFunction();
 
  protected:
-  virtual ~SocketAsyncApiFunction();
+  ~SocketAsyncApiFunction() override;
 
   // AsyncApiFunction:
-  virtual bool PrePrepare() OVERRIDE;
-  virtual bool Respond() OVERRIDE;
+  bool PrePrepare() override;
+  bool Respond() override;
 
   virtual scoped_ptr<SocketResourceManagerInterface>
       CreateSocketResourceManager();
@@ -125,10 +125,10 @@ class SocketAsyncApiFunction : public AsyncApiFunction {
 class SocketExtensionWithDnsLookupFunction : public SocketAsyncApiFunction {
  protected:
   SocketExtensionWithDnsLookupFunction();
-  virtual ~SocketExtensionWithDnsLookupFunction();
+  ~SocketExtensionWithDnsLookupFunction() override;
 
   // AsyncApiFunction:
-  virtual bool PrePrepare() OVERRIDE;
+  bool PrePrepare() override;
 
   void StartDnsLookup(const std::string& hostname);
   virtual void AfterDnsLookup(int lookup_result) = 0;
@@ -152,11 +152,11 @@ class SocketCreateFunction : public SocketAsyncApiFunction {
   SocketCreateFunction();
 
  protected:
-  virtual ~SocketCreateFunction();
+  ~SocketCreateFunction() override;
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SocketUnitTest, Create);
@@ -171,11 +171,11 @@ class SocketDestroyFunction : public SocketAsyncApiFunction {
   DECLARE_EXTENSION_FUNCTION("socket.destroy", SOCKET_DESTROY)
 
  protected:
-  virtual ~SocketDestroyFunction() {}
+  ~SocketDestroyFunction() override {}
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   int socket_id_;
@@ -188,14 +188,14 @@ class SocketConnectFunction : public SocketExtensionWithDnsLookupFunction {
   SocketConnectFunction();
 
  protected:
-  virtual ~SocketConnectFunction();
+  ~SocketConnectFunction() override;
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
 
   // SocketExtensionWithDnsLookupFunction:
-  virtual void AfterDnsLookup(int lookup_result) OVERRIDE;
+  void AfterDnsLookup(int lookup_result) override;
 
  private:
   void StartConnect();
@@ -204,7 +204,6 @@ class SocketConnectFunction : public SocketExtensionWithDnsLookupFunction {
   int socket_id_;
   std::string hostname_;
   int port_;
-  Socket* socket_;
 };
 
 class SocketDisconnectFunction : public SocketAsyncApiFunction {
@@ -212,11 +211,11 @@ class SocketDisconnectFunction : public SocketAsyncApiFunction {
   DECLARE_EXTENSION_FUNCTION("socket.disconnect", SOCKET_DISCONNECT)
 
  protected:
-  virtual ~SocketDisconnectFunction() {}
+  ~SocketDisconnectFunction() override {}
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   int socket_id_;
@@ -227,11 +226,11 @@ class SocketBindFunction : public SocketAsyncApiFunction {
   DECLARE_EXTENSION_FUNCTION("socket.bind", SOCKET_BIND)
 
  protected:
-  virtual ~SocketBindFunction() {}
+  ~SocketBindFunction() override {}
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   int socket_id_;
@@ -246,11 +245,11 @@ class SocketListenFunction : public SocketAsyncApiFunction {
   SocketListenFunction();
 
  protected:
-  virtual ~SocketListenFunction();
+  ~SocketListenFunction() override;
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   scoped_ptr<core_api::socket::Listen::Params> params_;
@@ -263,11 +262,11 @@ class SocketAcceptFunction : public SocketAsyncApiFunction {
   SocketAcceptFunction();
 
  protected:
-  virtual ~SocketAcceptFunction();
+  ~SocketAcceptFunction() override;
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
 
  private:
   void OnAccept(int result_code, net::TCPClientSocket* socket);
@@ -282,11 +281,11 @@ class SocketReadFunction : public SocketAsyncApiFunction {
   SocketReadFunction();
 
  protected:
-  virtual ~SocketReadFunction();
+  ~SocketReadFunction() override;
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
   void OnCompleted(int result, scoped_refptr<net::IOBuffer> io_buffer);
 
  private:
@@ -300,11 +299,11 @@ class SocketWriteFunction : public SocketAsyncApiFunction {
   SocketWriteFunction();
 
  protected:
-  virtual ~SocketWriteFunction();
+  ~SocketWriteFunction() override;
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
   void OnCompleted(int result);
 
  private:
@@ -320,11 +319,11 @@ class SocketRecvFromFunction : public SocketAsyncApiFunction {
   SocketRecvFromFunction();
 
  protected:
-  virtual ~SocketRecvFromFunction();
+  ~SocketRecvFromFunction() override;
 
   // AsyncApiFunction
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
   void OnCompleted(int result,
                    scoped_refptr<net::IOBuffer> io_buffer,
                    const std::string& address,
@@ -341,15 +340,15 @@ class SocketSendToFunction : public SocketExtensionWithDnsLookupFunction {
   SocketSendToFunction();
 
  protected:
-  virtual ~SocketSendToFunction();
+  ~SocketSendToFunction() override;
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
   void OnCompleted(int result);
 
   // SocketExtensionWithDnsLookupFunction:
-  virtual void AfterDnsLookup(int lookup_result) OVERRIDE;
+  void AfterDnsLookup(int lookup_result) override;
 
  private:
   void StartSendTo();
@@ -359,7 +358,6 @@ class SocketSendToFunction : public SocketExtensionWithDnsLookupFunction {
   size_t io_buffer_size_;
   std::string hostname_;
   int port_;
-  Socket* socket_;
 };
 
 class SocketSetKeepAliveFunction : public SocketAsyncApiFunction {
@@ -369,11 +367,11 @@ class SocketSetKeepAliveFunction : public SocketAsyncApiFunction {
   SocketSetKeepAliveFunction();
 
  protected:
-  virtual ~SocketSetKeepAliveFunction();
+  ~SocketSetKeepAliveFunction() override;
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   scoped_ptr<core_api::socket::SetKeepAlive::Params> params_;
@@ -386,11 +384,11 @@ class SocketSetNoDelayFunction : public SocketAsyncApiFunction {
   SocketSetNoDelayFunction();
 
  protected:
-  virtual ~SocketSetNoDelayFunction();
+  ~SocketSetNoDelayFunction() override;
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   scoped_ptr<core_api::socket::SetNoDelay::Params> params_;
@@ -403,11 +401,11 @@ class SocketGetInfoFunction : public SocketAsyncApiFunction {
   SocketGetInfoFunction();
 
  protected:
-  virtual ~SocketGetInfoFunction();
+  ~SocketGetInfoFunction() override;
 
   // AsyncApiFunction:
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   scoped_ptr<core_api::socket::GetInfo::Params> params_;
@@ -418,8 +416,8 @@ class SocketGetNetworkListFunction : public AsyncExtensionFunction {
   DECLARE_EXTENSION_FUNCTION("socket.getNetworkList", SOCKET_GETNETWORKLIST)
 
  protected:
-  virtual ~SocketGetNetworkListFunction() {}
-  virtual bool RunAsync() OVERRIDE;
+  ~SocketGetNetworkListFunction() override {}
+  bool RunAsync() override;
 
  private:
   void GetNetworkListOnFileThread();
@@ -434,11 +432,11 @@ class SocketJoinGroupFunction : public SocketAsyncApiFunction {
   SocketJoinGroupFunction();
 
  protected:
-  virtual ~SocketJoinGroupFunction();
+  ~SocketJoinGroupFunction() override;
 
   // AsyncApiFunction
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   scoped_ptr<core_api::socket::JoinGroup::Params> params_;
@@ -451,11 +449,11 @@ class SocketLeaveGroupFunction : public SocketAsyncApiFunction {
   SocketLeaveGroupFunction();
 
  protected:
-  virtual ~SocketLeaveGroupFunction();
+  ~SocketLeaveGroupFunction() override;
 
   // AsyncApiFunction
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   scoped_ptr<core_api::socket::LeaveGroup::Params> params_;
@@ -469,11 +467,11 @@ class SocketSetMulticastTimeToLiveFunction : public SocketAsyncApiFunction {
   SocketSetMulticastTimeToLiveFunction();
 
  protected:
-  virtual ~SocketSetMulticastTimeToLiveFunction();
+  ~SocketSetMulticastTimeToLiveFunction() override;
 
   // AsyncApiFunction
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   scoped_ptr<core_api::socket::SetMulticastTimeToLive::Params> params_;
@@ -487,11 +485,11 @@ class SocketSetMulticastLoopbackModeFunction : public SocketAsyncApiFunction {
   SocketSetMulticastLoopbackModeFunction();
 
  protected:
-  virtual ~SocketSetMulticastLoopbackModeFunction();
+  ~SocketSetMulticastLoopbackModeFunction() override;
 
   // AsyncApiFunction
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   scoped_ptr<core_api::socket::SetMulticastLoopbackMode::Params> params_;
@@ -505,11 +503,11 @@ class SocketGetJoinedGroupsFunction : public SocketAsyncApiFunction {
   SocketGetJoinedGroupsFunction();
 
  protected:
-  virtual ~SocketGetJoinedGroupsFunction();
+  ~SocketGetJoinedGroupsFunction() override;
 
   // AsyncApiFunction
-  virtual bool Prepare() OVERRIDE;
-  virtual void Work() OVERRIDE;
+  bool Prepare() override;
+  void Work() override;
 
  private:
   scoped_ptr<core_api::socket::GetJoinedGroups::Params> params_;
@@ -521,11 +519,11 @@ class SocketSecureFunction : public SocketAsyncApiFunction {
   SocketSecureFunction();
 
  protected:
-  virtual ~SocketSecureFunction();
+  ~SocketSecureFunction() override;
 
   // AsyncApiFunction
-  virtual bool Prepare() OVERRIDE;
-  virtual void AsyncWorkStart() OVERRIDE;
+  bool Prepare() override;
+  void AsyncWorkStart() override;
 
  private:
   // Callback from TLSSocket::UpgradeSocketToTLS().