Mark HID and USB device connections as non-persistent API resources.

Add an IsPersistent function to mark these resources as non-persistent
so that they will be cleaned up when the extension is suspended. The
default is persistent.

BUG=397234,409759

Review URL: https://codereview.chromium.org/548703003

Cr-Commit-Position: refs/heads/master@{#293626}

extensions/browser/api/hid/hid_api.h

@@ -16,9 +16,7 @@
 #include "extensions/common/api/hid.h"
 
 namespace net {
-
-class IOBufferWithSize;
-
+class IOBuffer;
 }  // namespace net
 
 namespace extensions {

extensions/browser/api/hid/hid_connection_resource.cc

@@ -32,4 +32,8 @@ HidConnectionResource::HidConnectionResource(
 
 HidConnectionResource::~HidConnectionResource() {}
 
+bool HidConnectionResource::IsPersistent() const {
+  return false;
+}
+
 }  // namespace extensions

extensions/browser/api/hid/hid_connection_resource.h

@@ -13,10 +13,17 @@
 #include "extensions/browser/api/api_resource.h"
 #include "extensions/browser/api/api_resource_manager.h"
 
+namespace device {
+class HidConnection;
+}
+
 namespace extensions {
 
 class HidConnectionResource : public ApiResource {
  public:
+  static const content::BrowserThread::ID kThreadId =
+      content::BrowserThread::FILE;
+
   HidConnectionResource(const std::string& owner_extension_id,
                         scoped_refptr<device::HidConnection> connection);
   virtual ~HidConnectionResource();
@@ -25,10 +32,9 @@ class HidConnectionResource : public ApiResource {
     return connection_;
   }
 
-  static const char* service_name() { return "HidConnectionResourceManager"; }
+  virtual bool IsPersistent() const OVERRIDE;
 
-  static const content::BrowserThread::ID kThreadId =
-      content::BrowserThread::FILE;
+  static const char* service_name() { return "HidConnectionResourceManager"; }
 
  private:
   scoped_refptr<device::HidConnection> connection_;

extensions/browser/api/usb/usb_device_resource.cc

@@ -37,9 +37,11 @@ UsbDeviceResource::UsbDeviceResource(const std::string& owner_extension_id,
 }
 
 UsbDeviceResource::~UsbDeviceResource() {
-  BrowserThread::PostTask(BrowserThread::FILE,
-                          FROM_HERE,
-                          base::Bind(&UsbDeviceHandle::Close, device_));
+  device_->Close();
+}
+
+bool UsbDeviceResource::IsPersistent() const {
+  return false;
 }
 
 }  // namespace extensions

extensions/browser/api/usb/usb_device_resource.h

@@ -5,36 +5,35 @@
 #ifndef EXTENSIONS_BROWSER_API_USB_USB_DEVICE_RESOURCE_H_
 #define EXTENSIONS_BROWSER_API_USB_USB_DEVICE_RESOURCE_H_
 
-#include <set>
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/usb/usb_device_handle.h"
 #include "extensions/browser/api/api_resource.h"
 #include "extensions/browser/api/api_resource_manager.h"
-#include "extensions/common/api/usb.h"
 
-namespace net {
-class IOBuffer;
-}  // namespace net
+namespace usb_service {
+class UsbDeviceHandle;
+}
 
 namespace extensions {
 
 // A UsbDeviceResource is an ApiResource wrapper for a UsbDevice.
 class UsbDeviceResource : public ApiResource {
  public:
+  static const content::BrowserThread::ID kThreadId =
+      content::BrowserThread::FILE;
+
   UsbDeviceResource(const std::string& owner_extension_id,
                     scoped_refptr<device::UsbDeviceHandle> device);
   virtual ~UsbDeviceResource();
 
   scoped_refptr<device::UsbDeviceHandle> device() { return device_; }
 
-  static const content::BrowserThread::ID kThreadId =
-      content::BrowserThread::FILE;
+  virtual bool IsPersistent() const OVERRIDE;
 
  private:
   friend class ApiResourceManager<UsbDeviceResource>;