| Index: content/gpu/gpu_child_thread.cc
|
| diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
|
| index 4a91da8f6c69838e2aa66ab7ab8418b37d13b836..790f18f7f59c7831b1d9ab13adcb2caeb79053c0 100644
|
| --- a/content/gpu/gpu_child_thread.cc
|
| +++ b/content/gpu/gpu_child_thread.cc
|
| @@ -223,9 +223,6 @@ void GpuChildThread::Init(const base::Time& process_start_time) {
|
| // will be destroyed before GpuChildThread is destructed.
|
| service_registry()->AddService(base::Bind(
|
| &GpuChildThread::BindProcessControlRequest, base::Unretained(this)));
|
| -
|
| - if (GetContentClient()->gpu()) // NULL in tests.
|
| - GetContentClient()->gpu()->RegisterMojoServices(service_registry());
|
| }
|
|
|
| bool GpuChildThread::Send(IPC::Message* msg) {
|
| @@ -392,6 +389,10 @@ void GpuChildThread::OnInitialize(const gpu::GpuPreferences& gpu_preferences) {
|
|
|
| media_service_.reset(new MediaService(gpu_channel_manager_.get()));
|
|
|
| + if (GetContentClient()->gpu()) // NULL in tests.
|
| + GetContentClient()->gpu()->RegisterMojoServices(service_registry(),
|
| + gpu_preferences_);
|
| +
|
| #if defined(USE_OZONE)
|
| ui::OzonePlatform::GetInstance()
|
| ->GetGpuPlatformSupport()
|
|
|