ScreenCapture for Android phase1, part II

content/browser/renderer_host/media/video_capture_manager.cc

Index: content/browser/renderer_host/media/video_capture_manager.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index 310c8f8ba844aacc3efad9da0009807ee13bd6b4..2badc16ec08cadaa9497a9243c4e80a1cd93836b 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -39,6 +39,9 @@
 #if defined(USE_AURA)
 #include "content/browser/media/capture/desktop_capture_device_aura.h"
 #endif
+#if defined(OS_ANDROID)
+#include "content/browser/media/capture/screen_capture_device_android.h"
+#endif
 #endif
 
 #if defined(OS_MACOSX)
@@ -584,6 +587,9 @@ VideoCaptureManager::DoStartDesktopCaptureOnDeviceThread(
   } else {
 #if defined(USE_AURA)
     video_capture_device = DesktopCaptureDeviceAura::Create(desktop_id);
+#elif defined(OS_ANDROID)
+    DCHECK(desktop_id.type == DesktopMediaID::TYPE_SCREEN);
+    video_capture_device = base::WrapUnique(new ScreenCaptureDeviceAndroid());
 #endif
     if (!video_capture_device)
       video_capture_device = DesktopCaptureDevice::Create(desktop_id);

[Sergey Ulanov, 2016/08/19 05:54:15]

DesktopCapture device is not applicable on Android so I think this code should
look as follows

#if ANDROIRD
  create ScreenCaptureDeviceAndroid
#else
#if AURA
  try create aura device
#endif
  create default capture device.
#endif

[braveyao, 2016/08/23 21:18:54]

Done.