| Index: content/common/gpu/media/rendering_helper.cc
|
| diff --git a/content/common/gpu/media/rendering_helper.cc b/content/common/gpu/media/rendering_helper.cc
|
| index 3ceea1fa6f9585178c9acda5e13d8f0f4c09ce2f..5a499ff02a878e9da27fb4e7f522e94411bed142 100644
|
| --- a/content/common/gpu/media/rendering_helper.cc
|
| +++ b/content/common/gpu/media/rendering_helper.cc
|
| @@ -40,6 +40,7 @@
|
| #if defined(USE_OZONE)
|
| #if defined(OS_CHROMEOS)
|
| #include "ui/display/chromeos/display_configurator.h"
|
| +#include "ui/display/types/native_display_delegate.h"
|
| #endif // defined(OS_CHROMEOS)
|
| #include "ui/ozone/public/ozone_platform.h"
|
| #include "ui/platform_window/platform_window.h"
|
| @@ -246,6 +247,7 @@ void RenderingHelper::Setup() {
|
| base::RunLoop wait_display_setup;
|
| DisplayConfiguratorObserver display_setup_observer(&wait_display_setup);
|
| display_configurator_.reset(new ui::DisplayConfigurator());
|
| + display_configurator_->SetDelegateForTesting(0);
|
| display_configurator_->AddObserver(&display_setup_observer);
|
| display_configurator_->Init(true);
|
| display_configurator_->ForceInitialConfigure(0);
|
|
|