Update To 11.40.268.0

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

diff --git a/src/remoting/host/host_event_logger_win.cc b/src/remoting/host/host_event_logger_win.cc
index acd6aaf..374cddb 100644 (file)
--- a/src/remoting/host/host_event_logger_win.cc
+++ b/src/remoting/host/host_event_logger_win.cc
@@ -32,15 +32,15 @@ class HostEventLoggerWin : public HostEventLogger, public HostStatusObserver {
 
   // HostStatusObserver implementation.  These methods will be called from the
   // network thread.
-  virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
-  virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
-  virtual void OnAccessDenied(const std::string& jid) OVERRIDE;
+  virtual void OnClientAuthenticated(const std::string& jid) override;
+  virtual void OnClientDisconnected(const std::string& jid) override;
+  virtual void OnAccessDenied(const std::string& jid) override;
   virtual void OnClientRouteChange(
       const std::string& jid,
       const std::string& channel_name,
-      const protocol::TransportRoute& route) OVERRIDE;
-  virtual void OnStart(const std::string& xmpp_login) OVERRIDE;
-  virtual void OnShutdown() OVERRIDE;
+      const protocol::TransportRoute& route) override;
+  virtual void OnStart(const std::string& xmpp_login) override;
+  virtual void OnShutdown() override;
 
  private:
   void LogString(WORD type, DWORD event_id, const std::string& string);
@@ -150,8 +150,7 @@ void HostEventLoggerWin::LogString(WORD type,
 scoped_ptr<HostEventLogger> HostEventLogger::Create(
     base::WeakPtr<HostStatusMonitor> monitor,
     const std::string& application_name) {
-  return scoped_ptr<HostEventLogger>(
-      new HostEventLoggerWin(monitor, application_name));
+  return make_scoped_ptr(new HostEventLoggerWin(monitor, application_name));
 }
 
 }  // namespace remoting