Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / host / gnubby_auth_handler_win.cc

diff --git a/src/remoting/host/gnubby_auth_handler_win.cc b/src/remoting/host/gnubby_auth_handler_win.cc
index 12731b3..e24eb6b 100644 (file)
--- a/src/remoting/host/gnubby_auth_handler_win.cc
+++ b/src/remoting/host/gnubby_auth_handler_win.cc
@@ -13,9 +13,9 @@ namespace {
 class GnubbyAuthHandlerWin : public GnubbyAuthHandler {
  private:
   // GnubbyAuthHandler interface.
-  virtual void DeliverClientMessage(const std::string& message) OVERRIDE;
+  virtual void DeliverClientMessage(const std::string& message) override;
   virtual void DeliverHostDataMessage(int connection_id,
-                                      const std::string& data) const OVERRIDE;
+                                      const std::string& data) const override;
 
   DISALLOW_COPY_AND_ASSIGN(GnubbyAuthHandlerWin);
 };
@@ -25,7 +25,7 @@ class GnubbyAuthHandlerWin : public GnubbyAuthHandler {
 // static
 scoped_ptr<GnubbyAuthHandler> GnubbyAuthHandler::Create(
     protocol::ClientStub* client_stub) {
-  return scoped_ptr<GnubbyAuthHandler>();
+  return nullptr;
 }
 
 // static