diff --git a/modules/desktop_capture/screen_capturer_fuchsia.cc b/modules/desktop_capture/screen_capturer_fuchsia.cc index 19c4c735ad..b67632d1f9 100644 --- a/modules/desktop_capture/screen_capturer_fuchsia.cc +++ b/modules/desktop_capture/screen_capturer_fuchsia.cc @@ -56,18 +56,12 @@ size_t RoundUpToMultiple(size_t value, size_t multiple) { std::unique_ptr DesktopCapturer::CreateRawScreenCapturer( const DesktopCaptureOptions& options) { - if (ScreenCapturerFuchsia::CheckRequirements()) { - std::unique_ptr capturer( - new ScreenCapturerFuchsia()); - return capturer; - } - return nullptr; + std::unique_ptr capturer(new ScreenCapturerFuchsia()); + return capturer; } ScreenCapturerFuchsia::ScreenCapturerFuchsia() - : component_context_(sys::ComponentContext::Create()) { - RTC_DCHECK(CheckRequirements()); -} + : component_context_(sys::ComponentContext::Create()) {} ScreenCapturerFuchsia::~ScreenCapturerFuchsia() { // unmap virtual memory mapped pointers @@ -82,26 +76,6 @@ ScreenCapturerFuchsia::~ScreenCapturerFuchsia() { } } -// TODO(fxbug.dev/100303): Remove this function when Flatland is the only API. -bool ScreenCapturerFuchsia::CheckRequirements() { - std::unique_ptr component_context = - sys::ComponentContext::Create(); - fuchsia::ui::scenic::ScenicSyncPtr scenic; - zx_status_t status = component_context->svc()->Connect(scenic.NewRequest()); - if (status != ZX_OK) { - RTC_LOG(LS_ERROR) << "Failed to connect to Scenic: " << status; - return false; - } - - bool scenic_uses_flatland = false; - scenic->UsesFlatland(&scenic_uses_flatland); - if (!scenic_uses_flatland) { - RTC_LOG(LS_ERROR) << "Screen capture not supported without Flatland."; - } - - return scenic_uses_flatland; -} - void ScreenCapturerFuchsia::Start(Callback* callback) { RTC_DCHECK(!callback_); RTC_DCHECK(callback); diff --git a/modules/desktop_capture/screen_capturer_fuchsia.h b/modules/desktop_capture/screen_capturer_fuchsia.h index 444930963f..6e0f87cc58 100644 --- a/modules/desktop_capture/screen_capturer_fuchsia.h +++ b/modules/desktop_capture/screen_capturer_fuchsia.h @@ -29,8 +29,6 @@ class ScreenCapturerFuchsia final : public DesktopCapturer { ScreenCapturerFuchsia(); ~ScreenCapturerFuchsia() override; - static bool CheckRequirements(); - // DesktopCapturer interface. void Start(Callback* callback) override; void CaptureFrame() override;