| Index: remoting/host/host_event_logger_posix.cc
|
| diff --git a/remoting/host/host_event_logger_posix.cc b/remoting/host/host_event_logger_posix.cc
|
| index ce0614013bd4bdf9afceea2c4914f90b2dc07286..7b7112ee0a24fb4a7c3fcacb0ee14180c3347bf7 100644
|
| --- a/remoting/host/host_event_logger_posix.cc
|
| +++ b/remoting/host/host_event_logger_posix.cc
|
| @@ -4,8 +4,15 @@
|
|
|
| #include "remoting/host/host_event_logger.h"
|
|
|
| +// Included here, since the #define for LOG_USER in syslog.h conflicts with the
|
| +// constants in base/logging.h, and this source file should use the version in
|
| +// syslog.h.
|
| +#include <syslog.h>
|
| +
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "net/base/ip_endpoint.h"
|
| @@ -13,11 +20,6 @@
|
| #include "remoting/host/host_status_observer.h"
|
| #include "remoting/protocol/transport.h"
|
|
|
| -// Included here, since the #define for LOG_USER in syslog.h conflicts with the
|
| -// constants in base/logging.h, and this source file should use the version in
|
| -// syslog.h.
|
| -#include <syslog.h>
|
| -
|
| namespace remoting {
|
|
|
| namespace {
|
| @@ -103,10 +105,10 @@ void HostEventLoggerPosix::Log(const std::string& message) {
|
| }
|
|
|
| // static
|
| -scoped_ptr<HostEventLogger> HostEventLogger::Create(
|
| +std::unique_ptr<HostEventLogger> HostEventLogger::Create(
|
| base::WeakPtr<HostStatusMonitor> monitor,
|
| const std::string& application_name) {
|
| - return make_scoped_ptr(new HostEventLoggerPosix(monitor, application_name));
|
| + return base::WrapUnique(new HostEventLoggerPosix(monitor, application_name));
|
| }
|
|
|
| } // namespace remoting
|
|
|