diff options
| -rw-r--r-- | chromeos/network/managed_network_configuration_handler.cc | 6 | ||||
| -rw-r--r-- | media/base/android/media_player_listener.cc | 2 | ||||
| -rw-r--r-- | remoting/host/disconnect_window_win.cc | 6 | ||||
| -rw-r--r-- | remoting/host/local_input_monitor_win.cc | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/chromeos/network/managed_network_configuration_handler.cc b/chromeos/network/managed_network_configuration_handler.cc index 8025034..462d0a6 100644 --- a/chromeos/network/managed_network_configuration_handler.cc +++ b/chromeos/network/managed_network_configuration_handler.cc @@ -591,7 +591,7 @@ class ManagedNetworkConfigurationHandler::PolicyApplicator friend class base::RefCounted<PolicyApplicator>; void GetProfileProperties(const base::DictionaryValue& profile_properties) { - if (!handler_) { + if (!handler_.get()) { LOG(WARNING) << "Handler destructed during policy application to profile " << profile_.ToDebugString(); return; @@ -623,7 +623,7 @@ class ManagedNetworkConfigurationHandler::PolicyApplicator void GetEntry(const std::string& entry, const base::DictionaryValue& entry_properties) { - if (!handler_) { + if (!handler_.get()) { LOG(WARNING) << "Handler destructed during policy application to profile " << profile_.ToDebugString(); return; @@ -736,7 +736,7 @@ class ManagedNetworkConfigurationHandler::PolicyApplicator } virtual ~PolicyApplicator() { - if (!handler_) { + if (!handler_.get()) { LOG(WARNING) << "Handler destructed during policy application to profile " << profile_.ToDebugString(); return; diff --git a/media/base/android/media_player_listener.cc b/media/base/android/media_player_listener.cc index d64aac7..4696bf5 100644 --- a/media/base/android/media_player_listener.cc +++ b/media/base/android/media_player_listener.cc @@ -26,7 +26,7 @@ MediaPlayerListener::MediaPlayerListener( : message_loop_(message_loop), media_player_(media_player) { DCHECK(message_loop_); - DCHECK(media_player_); + DCHECK(media_player_.get()); } MediaPlayerListener::~MediaPlayerListener() {} diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc index 6d06346..bb8cf15 100644 --- a/remoting/host/disconnect_window_win.cc +++ b/remoting/host/disconnect_window_win.cc @@ -103,8 +103,8 @@ DisconnectWindowWin::~DisconnectWindowWin() { void DisconnectWindowWin::Start( const base::WeakPtr<ClientSessionControl>& client_session_control) { DCHECK(CalledOnValidThread()); - DCHECK(!client_session_control_); - DCHECK(client_session_control); + DCHECK(!client_session_control_.get()); + DCHECK(client_session_control.get()); client_session_control_ = client_session_control; @@ -274,7 +274,7 @@ void DisconnectWindowWin::EndDialog() { hwnd_ = NULL; } - if (client_session_control_) + if (client_session_control_.get()) client_session_control_->DisconnectSession(); } diff --git a/remoting/host/local_input_monitor_win.cc b/remoting/host/local_input_monitor_win.cc index 98cd8a4..a0be226 100644 --- a/remoting/host/local_input_monitor_win.cc +++ b/remoting/host/local_input_monitor_win.cc @@ -104,7 +104,7 @@ LocalInputMonitorWin::Core::Core( : caller_task_runner_(caller_task_runner), ui_task_runner_(ui_task_runner), client_session_control_(client_session_control) { - DCHECK(client_session_control_); + DCHECK(client_session_control_.get()); } void LocalInputMonitorWin::Core::Start() { |