Revert r404778 and r405887.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
index e52030ecf72d9a251905bd03acdb653bf9e3c30d..3dd72b5b70cb9fb2de27c122f504e57aff595b2b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
@@ -29,9 +29,13 @@ public class WebsitePermissionsFetcher {
     }
 
     // This is a 1 <--> 1..N mapping between origin and Website.
+    // TODO(mvanouwerkerk): The Website class has no equals or hashCode methods so storing them in
+    // a HashSet is really confusing to readers of this code. There is no deduplication at all.
     private final Map<String, Set<Website>> mSitesByOrigin = new HashMap<>();
 
     // This is a 1 <--> 1..N mapping between host and Website.
+    // TODO(mvanouwerkerk): The Website class has no equals or hashCode methods so storing them in
+    // a HashSet is really confusing to readers of this code. There is no deduplication at all.
     private final Map<String, Set<Website>> mSitesByHost = new HashMap<>();
 
     // The callback to run when the permissions have been fetched.
@@ -83,8 +87,6 @@ public class WebsitePermissionsFetcher {
         queue.add(new BackgroundSyncExceptionInfoFetcher());
         // Autoplay permission is per-origin.
         queue.add(new AutoplayExceptionInfoFetcher());
-        // USB device permission is per-origin and per-embedder.
-        queue.add(new UsbInfoFetcher());
 
         queue.add(new PermissionsAvailableCallbackRunner());
 
@@ -409,18 +411,6 @@ public class WebsitePermissionsFetcher {
         }
     }
 
-    private class UsbInfoFetcher extends Task {
-        @Override
-        public void run() {
-            for (UsbInfo info : WebsitePreferenceBridge.getUsbInfo()) {
-                WebsiteAddress address = WebsiteAddress.create(info.getOrigin());
-                if (address == null) continue;
-                Set<Website> sites = findOrCreateSitesByOrigin(address);
-                for (Website site : sites) site.addUsbInfo(info);
-            }
-        }
-    }
-
     private class PermissionsAvailableCallbackRunner extends Task {
         @Override
         public void run() {