Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / device_monitor_mac.mm

diff --git a/src/content/browser/device_monitor_mac.mm b/src/content/browser/device_monitor_mac.mm
index 2d872d7..57a556b 100644 (file)
--- a/src/content/browser/device_monitor_mac.mm
+++ b/src/content/browser/device_monitor_mac.mm
@@ -14,7 +14,7 @@
 #include "base/mac/scoped_nsobject.h"
 #include "base/threading/thread_checker.h"
 #include "content/public/browser/browser_thread.h"
-#import "media/video/capture/mac/avfoundation_glue.h"
+#import "media/base/mac/avfoundation_glue.h"
 
 using content::BrowserThread;
 
@@ -297,7 +297,9 @@ void SuspendObserverDelegate::StartObserver(
   // Enumerate the devices in Device thread and post the observers start to be
   // done on UI thread. The devices array is retained in |device_thread| and
   // released in DoStartObserver().
-  base::PostTaskAndReplyWithResult(device_thread, FROM_HERE,
+  base::PostTaskAndReplyWithResult(
+      device_thread.get(),
+      FROM_HERE,
       base::BindBlock(^{ return [[AVCaptureDeviceGlue devices] retain]; }),
       base::Bind(&SuspendObserverDelegate::DoStartObserver, this));
 }
@@ -308,7 +310,9 @@ void SuspendObserverDelegate::OnDeviceChanged(
   // Enumerate the devices in Device thread and post the consolidation of the
   // new devices and the old ones to be done on UI thread. The devices array
   // is retained in |device_thread| and released in DoOnDeviceChanged().
-  PostTaskAndReplyWithResult(device_thread, FROM_HERE,
+  PostTaskAndReplyWithResult(
+      device_thread.get(),
+      FROM_HERE,
       base::BindBlock(^{ return [[AVCaptureDeviceGlue devices] retain]; }),
       base::Bind(&SuspendObserverDelegate::DoOnDeviceChanged, this));
 }