Fix OS X use of WeakPtr<T>'s operator T* conversion

BUG=245942
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/15984008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204164 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 21 insertions, 21 deletions

diff --git a/chrome/browser/storage_monitor/image_capture_device.mm b/chrome/browser/storage_monitor/image_capture_device.mm
index 15fb913..56e6488 100644
--- a/chrome/browser/storage_monitor/image_capture_device.mm
+++ b/chrome/browser/storage_monitor/image_capture_device.mm
@@ -24,7 +24,7 @@ void ReturnRenameResultToListener(
     base::PlatformFileError* result) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   scoped_ptr<base::PlatformFileError> result_deleter(result);
-  if (listener)
+  if (listener.get())
     listener->DownloadedFile(name, *result);
 }
 
@@ -68,7 +68,7 @@ base::FilePath PathForCameraItem(ICCameraItem* item) {
   // Make sure the session was closed and listener set to null
   // before destruction.
   DCHECK(![camera_ delegate]);
-  DCHECK(!listener_);
+  DCHECK(!listener_.get());
   [super dealloc];
 }
 
@@ -79,7 +79,7 @@ base::FilePath PathForCameraItem(ICCameraItem* item) {
 
 - (void)open {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  DCHECK(listener_);
+  DCHECK(listener_.get());
   [camera_ requestOpenSession];
 }
 
@@ -125,7 +125,7 @@ base::FilePath PathForCameraItem(ICCameraItem* item) {
     }
   }
 
-  if (listener_)
+  if (listener_.get())
     listener_->DownloadedFile(name, base::PLATFORM_FILE_ERROR_NOT_FOUND);
 }
 
@@ -142,7 +142,7 @@ base::FilePath PathForCameraItem(ICCameraItem* item) {
   info.creation_time = NSDateToBaseTime([item creationDate]);
   info.last_accessed = info.last_modified;
 
-  if (listener_)
+  if (listener_.get())
     listener_->ItemAdded(path.value(), info);
 }
 
@@ -153,7 +153,7 @@ base::FilePath PathForCameraItem(ICCameraItem* item) {
 
 - (void)didRemoveDevice:(ICDevice*)device {
   device.delegate = NULL;
-  if (listener_)
+  if (listener_.get())
     listener_->DeviceRemoved();
 }
 
@@ -165,13 +165,13 @@ base::FilePath PathForCameraItem(ICCameraItem* item) {
 }
 
 - (void)device:(ICDevice*)device didEncounterError:(NSError*)error {
-  if (error && listener_)
+  if (error && listener_.get())
     listener_->DeviceRemoved();
 }
 
 // When this message is received, all media metadata is now loaded.
 - (void)deviceDidBecomeReadyWithCompleteContentCatalog:(ICDevice*)device {
-  if (listener_)
+  if (listener_.get())
     listener_->NoMoreItems();
 }
 
@@ -187,7 +187,7 @@ base::FilePath PathForCameraItem(ICCameraItem* item) {
   if (error) {
     DLOG(INFO) << "error..."
                << base::SysNSStringToUTF8([error localizedDescription]);
-    if (listener_)
+    if (listener_.get())
       listener_->DownloadedFile(name, base::PLATFORM_FILE_ERROR_FAILED);
     return;
   }
@@ -197,7 +197,7 @@ base::FilePath PathForCameraItem(ICCameraItem* item) {
   std::string saveAsFilename =
       base::SysNSStringToUTF8([options objectForKey:ICSaveAsFilename]);
   if (savedFilename == saveAsFilename) {
-    if (listener_)
+    if (listener_.get())
       listener_->DownloadedFile(name, base::PLATFORM_FILE_OK);
     return;
   }
diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
index c8b5d3b..4e9073b 100644
--- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
@@ -80,7 +80,7 @@ class Bridge : public GlobalErrorBubbleViewBase {
 - (void)awakeFromNib {
   [super awakeFromNib];
 
-  DCHECK(error_);
+  DCHECK(error_.get());
 
   gfx::Image image = error_->GetBubbleViewIcon();
   DCHECK(!image.IsEmpty());
@@ -138,7 +138,7 @@ class Bridge : public GlobalErrorBubbleViewBase {
 }
 
 - (void)close {
-  if (error_)
+  if (error_.get())
     error_->BubbleViewDidClose(browser_);
   bridge_.reset();
   BrowserWindowController* bwc = [BrowserWindowController
@@ -148,13 +148,13 @@ class Bridge : public GlobalErrorBubbleViewBase {
 }
 
 - (IBAction)onAccept:(id)sender {
-  if (error_)
+  if (error_.get())
     error_->BubbleViewAcceptButtonPressed(browser_);
   [self close];
 }
 
 - (IBAction)onCancel:(id)sender {
-  if (error_)
+  if (error_.get())
     error_->BubbleViewCancelButtonPressed(browser_);
   [self close];
 }
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 6ec5189..1a25523 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -232,7 +232,7 @@ WebPluginDelegateProxy::SharedBitmap::~SharedBitmap() {}
 void WebPluginDelegateProxy::PluginDestroyed() {
 #if defined(OS_MACOSX) || defined(OS_WIN)
   // Ensure that the renderer doesn't think the plugin still has focus.
-  if (render_view_)
+  if (render_view_.get())
     render_view_->PluginFocusChanged(false, instance_id_);
 #endif
 
@@ -492,7 +492,7 @@ void WebPluginDelegateProxy::OnChannelError() {
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
   // Ensure that the renderer doesn't think the plugin still has focus.
-  if (render_view_)
+  if (render_view_.get())
     render_view_->PluginFocusChanged(false, instance_id_);
 #endif
 }
@@ -1129,12 +1129,12 @@ WebPluginDelegateProxy::CreateSeekableResourceClient(
 
 #if defined(OS_MACOSX)
 void WebPluginDelegateProxy::OnFocusChanged(bool focused) {
-  if (render_view_)
+  if (render_view_.get())
     render_view_->PluginFocusChanged(focused, instance_id_);
 }
 
 void WebPluginDelegateProxy::OnStartIme() {
-  if (render_view_)
+  if (render_view_.get())
     render_view_->StartPluginIme();
 }
 #endif
diff --git a/remoting/host/curtain_mode_mac.cc b/remoting/host/curtain_mode_mac.cc
index b68ab11..ff109dac 100644
--- a/remoting/host/curtain_mode_mac.cc
+++ b/remoting/host/curtain_mode_mac.cc
@@ -205,7 +205,7 @@ void SessionWatcher::DisconnectSession() {
     return;
   }
 
-  if (client_session_control_)
+  if (client_session_control_.get())
     client_session_control_->DisconnectSession();
 }
 
diff --git a/remoting/host/disconnect_window_mac.mm b/remoting/host/disconnect_window_mac.mm
index 0c95c2b..580ce8d 100644
--- a/remoting/host/disconnect_window_mac.mm
+++ b/remoting/host/disconnect_window_mac.mm
@@ -60,7 +60,7 @@ DisconnectWindowMac::~DisconnectWindowMac() {
 void DisconnectWindowMac::Start(
     const base::WeakPtr<ClientSessionControl>& client_session_control) {
   DCHECK(CalledOnValidThread());
-  DCHECK(client_session_control);
+  DCHECK(client_session_control.get());
   DCHECK(window_controller_ == nil);
 
   // Create the window.
diff --git a/remoting/host/local_input_monitor_mac.mm b/remoting/host/local_input_monitor_mac.mm
index f38489a..d89ed2a 100644
--- a/remoting/host/local_input_monitor_mac.mm
+++ b/remoting/host/local_input_monitor_mac.mm
@@ -214,7 +214,7 @@ LocalInputMonitorMac::Core::Core(
       ui_task_runner_(ui_task_runner),
       manager_(nil),
       client_session_control_(client_session_control) {
-  DCHECK(client_session_control_);
+  DCHECK(client_session_control_.get());
 }
 
 void LocalInputMonitorMac::Core::Start() {