Make the device::HidService destructor protected.

device/hid/hid_service.cc

 // Copyright 2014 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 "device/hid/hid_service.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_restrictions.h"
 
 #if defined(OS_LINUX) && defined(USE_UDEV)
 #include "device/hid/hid_service_linux.h"
 #elif defined(OS_MACOSX)
 #include "device/hid/hid_service_mac.h"
 #else
 #include "device/hid/hid_service_win.h"
 #endif
 
 namespace device {
 
 namespace {
 
 HidService* g_service = NULL;
 
-class HidServiceDestroyer : public base::MessageLoop::DestructionObserver {
+}  // namespace
+
+class HidService::Destroyer : public base::MessageLoop::DestructionObserver {
  public:
-  explicit HidServiceDestroyer(HidService* hid_service)
+  explicit Destroyer(HidService* hid_service)
       : hid_service_(hid_service) {}
-  virtual ~HidServiceDestroyer() {}
+  virtual ~Destroyer() {}
 
  private:
   // base::MessageLoop::DestructionObserver implementation.
   virtual void WillDestroyCurrentMessageLoop() OVERRIDE {
     base::MessageLoop::current()->RemoveDestructionObserver(this);
     delete hid_service_;
     delete this;
     g_service = NULL;
   }
 
   HidService* hid_service_;
 };
 
-}  // namespace
-
 HidService* HidService::GetInstance(
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   if (g_service == NULL) {
 #if defined(OS_LINUX) && defined(USE_UDEV)
     g_service = new HidServiceLinux(ui_task_runner);
 #elif defined(OS_MACOSX)
     g_service = new HidServiceMac();
 #elif defined(OS_WIN)
     g_service = new HidServiceWin();
 #endif
     if (g_service != NULL) {
-      HidServiceDestroyer* destroyer = new HidServiceDestroyer(g_service);
+      Destroyer* destroyer = new Destroyer(g_service);
       base::MessageLoop::current()->AddDestructionObserver(destroyer);
     }
   }
   return g_service;
 }
 
 HidService::~HidService() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
@@ skipping 34 matching lines @@
   DeviceMap::iterator it = devices_.find(device_id);
   if (it != devices_.end())
     devices_.erase(it);
 }
 
 const HidService::DeviceMap& HidService::GetDevicesNoEnumerate() const {
   return devices_;
 }
 
 }  // namespace device