diff --git a/talk/media/devices/devicemanager.cc b/talk/media/devices/devicemanager.cc
index d6745bba3..75b935ce5 100644
--- a/talk/media/devices/devicemanager.cc
+++ b/talk/media/devices/devicemanager.cc
@@ -39,8 +39,6 @@
 #include "talk/media/devices/filevideocapturer.h"
 #include "talk/media/devices/yuvframescapturer.h"
 
-#if !defined(IOS)
-
 #if defined(HAVE_WEBRTC_VIDEO)
 #include "talk/media/webrtc/webrtcvideocapturer.h"
 #endif
@@ -51,8 +49,6 @@
 #endif
 
 
-#endif
-
 namespace {
 
 bool StringMatchWithWildcard(
@@ -101,7 +97,7 @@ DeviceManager::~DeviceManager() {
 
 bool DeviceManager::Init() {
   if (!initialized()) {
-    if (watcher() && !watcher()->Start()) {
+    if (!watcher()->Start()) {
       return false;
     }
     set_initialized(true);
@@ -111,9 +107,7 @@ bool DeviceManager::Init() {
 
 void DeviceManager::Terminate() {
   if (initialized()) {
-    if (watcher()) {
-      watcher()->Stop();
-    }
+    watcher()->Stop();
     set_initialized(false);
   }
 }