Revert r404778 and r405887.

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 319ae5e6e0b7bedb10acdee7824631b7c0c5b656..f87160156676da16faf5134cf45e27f16e58658a 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
@@ -43,7 +43,6 @@ 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 address) {
         mAddress = address;
@@ -503,32 +502,4 @@ 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);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof Website) {
-            Website other = (Website) obj;
-            return mAddress.equals(other.mAddress);
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return mAddress.hashCode();
-    }
 }