Reland: Add USB device permissions to individual site settings on Android.

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
index a3ad7e0e15c7d1f3207b0abedbc3ca398fc4fbf3..9cc21187733ebbbd5e72d43b9050e39db2a10887 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
@@ -42,6 +42,7 @@ public class Website implements Serializable {
     private ProtectedMediaIdentifierInfo mProtectedMediaIdentifierInfo;
     private final List<StorageInfo> mStorageInfo = new ArrayList<StorageInfo>();
     private int mStorageInfoCallbacksLeft;
+    private final List<UsbInfo> mUsbInfo = new ArrayList<UsbInfo>();
 
     public Website(WebsiteAddress origin, WebsiteAddress embedder) {
         mOrigin = origin;
@@ -485,4 +486,18 @@ public class Website implements Serializable {
         }
         return usage;
     }
+
+    /**
+     * Add information about a USB device permission to the set stored in this object.
+     */
+    public void addUsbInfo(UsbInfo info) {
+        mUsbInfo.add(info);
+    }
+
+    /**
+     * Returns the set of USB devices this website has been granted permission to access.
+     */
+    public List<UsbInfo> getUsbInfo() {
+        return new ArrayList<UsbInfo>(mUsbInfo);
+    }
 }