Fix leak in VRServiceImpl

device/vr/vr_display_impl.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <utility>
 
 #include "base/bind.h"
 #include "device/vr/vr_device.h"
 #include "device/vr/vr_service_impl.h"
 
 namespace device {
 
 VRDisplayImpl::VRDisplayImpl(device::VRDevice* device, VRServiceImpl* service)
     : binding_(this),
       device_(device),
       service_(service),
       weak_ptr_factory_(this) {
   mojom::VRDisplayInfoPtr display_info = device->GetVRDevice();
   // Client might be null in unittest.
   // TODO: setup a mock client in unittest too?
   if (service->client()) {
     service->client()->OnDisplayConnected(binding_.CreateInterfacePtrAndBind(),
                                           mojo::GetProxy(&client_),
                                           std::move(display_info));
   }
 }
 
-VRDisplayImpl::~VRDisplayImpl() {}
+VRDisplayImpl::~VRDisplayImpl() {
+  device_->RemoveService(service_);
+}
 
 void VRDisplayImpl::GetPose(const GetPoseCallback& callback) {
   if (!device_->IsAccessAllowed(service_)) {
     callback.Run(nullptr);
     return;
   }
 
   callback.Run(device_->GetPose());
 }
 
@@ skipping 38 matching lines @@
 }
 
 void VRDisplayImpl::UpdateLayerBounds(mojom::VRLayerBoundsPtr left_bounds,
                                       mojom::VRLayerBoundsPtr right_bounds) {
   if (!device_->IsAccessAllowed(service_))
     return;
 
   device_->UpdateLayerBounds(std::move(left_bounds), std::move(right_bounds));
 }
 }