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..6f8e7ae1c0e90237f7460b1fe7d63af4aaa269fb 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)
@@ -585,6 +588,10 @@ VideoCaptureManager::DoStartDesktopCaptureOnDeviceThread(
 #if defined(USE_AURA)
     video_capture_device = DesktopCaptureDeviceAura::Create(desktop_id);
 #endif
+#if defined(OS_ANDROID)

[miu, 2016/07/14 22:25:53]

Use #elif here instead.

[braveyao, 2016/07/18 20:46:31]

Done.

+    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);
   }