Commit d0cd2b3c authored by kylechar's avatar kylechar Committed by Commit Bot

Use OzonePlatform::InitParams everywhere.

Remove the deprecated function that uses default InitParams. Add the
params in the remaining callsites and set |single_process| correctly for
tests. video_decode_accelerator_unittest.cc sets |single_process| to
false, as the test runs with Ozone DRM on CrOS devices.

Bug: 620934, 700142
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Iaac92d25eba7c9e052c250e84fdef2f46ecea7ee
Reviewed-on: https://chromium-review.googlesource.com/667720
Commit-Queue: kylechar <kylechar@chromium.org>
Reviewed-by: default avatarRobert Kroeger <rjkroege@chromium.org>
Reviewed-by: default avatarDan Sanders <sandersd@chromium.org>
Reviewed-by: default avatardanakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#502731}
parent 0d81a8a8
......@@ -1823,7 +1823,9 @@ class VDATestSuite : public base::TestSuite {
new media::VideoDecodeAcceleratorTestEnvironment()));
#if defined(OS_CHROMEOS)
ui::OzonePlatform::InitializeForUI();
ui::OzonePlatform::InitParams params;
params.single_process = false;
ui::OzonePlatform::InitializeForUI(params);
#endif
#if BUILDFLAG(USE_VAAPI)
......
......@@ -35,7 +35,9 @@ void CompositorTestSuite::Initialize() {
gl::GLSurfaceTestSupport::InitializeOneOff();
#if defined(USE_OZONE)
ui::OzonePlatform::InitializeForUI();
OzonePlatform::InitParams params;
params.single_process = true;
OzonePlatform::InitializeForUI(params);
#endif
gfx::RegisterPathProvider();
......
......@@ -352,7 +352,9 @@ int main(int argc, char** argv) {
base::MessageLoopForUI message_loop;
base::TaskScheduler::CreateAndStartWithDefaultParams("OzoneDemo");
ui::OzonePlatform::InitializeForUI();
ui::OzonePlatform::InitParams params;
params.single_process = true;
ui::OzonePlatform::InitializeForUI(params);
ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()
->SetCurrentLayoutByName("us");
......
......@@ -33,12 +33,6 @@ OzonePlatform::~OzonePlatform() {
SetNativeInputInjectorFactory(nullptr);
}
// static
void OzonePlatform::InitializeForUI() {
const InitParams params;
OzonePlatform::InitializeForUI(params);
}
// static
void OzonePlatform::InitializeForUI(const InitParams& args) {
EnsureInstance();
......
......@@ -80,11 +80,6 @@ class OZONE_EXPORT OzonePlatform : public SystemInputInjectorFactory {
// platform selected at runtime, e.g. ::GetMessageLoopTypeForGpu.
static OzonePlatform* EnsureInstance();
// Initializes the subsystems/resources necessary for the UI process (e.g.
// events, etc.)
// TODO(rjkroege): Remove deprecated entry point (http://crbug.com/620934)
static void InitializeForUI();
// Initializes the subsystems/resources necessary for the UI process (e.g.
// events) with additional properties to customize the ozone platform
// implementation. Ozone will not retain InitParams after returning from
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment