| Index: components/exo/wayland/server.cc
 | 
| diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
 | 
| index e541591d3e903afb76ed5383054e4e9e57f4b1b2..47f1b5c767558b8fdf9a0ecd7d3767203e9428ef 100644
 | 
| --- a/components/exo/wayland/server.cc
 | 
| +++ b/components/exo/wayland/server.cc
 | 
| @@ -3565,7 +3565,7 @@ void gaming_input_get_gaming_seat(wl_client* client,
 | 
|    SetImplementation(gaming_seat_resource, &gaming_seat_implementation,
 | 
|                      base::MakeUnique<GamingSeat>(
 | 
|                          new WaylandGamingSeatDelegate(gaming_seat_resource),
 | 
| -                        gaming_input_thread->task_runner().get()));
 | 
| +                        gaming_input_thread));
 | 
|  }
 | 
|  
 | 
|  void gaming_input_destroy(wl_client* client, wl_resource* resource) {
 | 
| @@ -3582,13 +3582,9 @@ void bind_gaming_input(wl_client* client,
 | 
|    wl_resource* resource =
 | 
|        wl_resource_create(client, &zcr_gaming_input_v2_interface, version, id);
 | 
|  
 | 
| -  std::unique_ptr<base::Thread> gaming_input_thread(
 | 
| -      new base::Thread("Exo gaming input polling thread."));
 | 
| -  gaming_input_thread->StartWithOptions(
 | 
| -      base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
 | 
| -
 | 
| -  SetImplementation(resource, &gaming_input_implementation,
 | 
| -                    std::move(gaming_input_thread));
 | 
| +  SetImplementation(
 | 
| +      resource, &gaming_input_implementation,
 | 
| +      std::unique_ptr<base::Thread>(GamingSeat::CreatePollingThreadIfNeeded()));
 | 
|  }
 | 
|  
 | 
|  ////////////////////////////////////////////////////////////////////////////////
 | 
| 
 |