FIDO U2F component extension

FIDO U2F (Universal 2nd factor) component extension

NOTRY=true
BUG=364678
TBR=miket

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266655

[xiyuan, 2014-04-24 18:23:10]

LGTM

A couple of more owners:
miket@ for extensions/*
sky@ for browser_resources.grd

[sky, 2014-04-24 19:12:01]

LGTM

[Ken Rockot(use gerrit already), 2014-04-24 20:59:23]

The CQ bit was checked by rockot@chromium.org

[commit-bot: I haz the power, 2014-04-24 21:14:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/arnarb@chromium.org/249913002/1

[commit-bot: I haz the power, 2014-04-24 22:44:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-24 22:44:45]

Try jobs failed on following builders:
  tryserver.chromium on chromium_presubmit

[Ken Rockot(use gerrit already), 2014-04-25 01:40:31]

On 2014/04/24 22:44:45, I haz the power (commit-bot) wrote:
> Try jobs failed on following builders:
>   tryserver.chromium on chromium_presubmit

Just to preserve it here, the presubmit is failing due to
http://crbug.com/366395

[Arnar Birgisson, 2014-04-25 08:00:51]

The CQ bit was checked by arnarb@chromium.org

[Arnar Birgisson, 2014-04-25 08:00:52]

The CQ bit was unchecked by arnarb@chromium.org

[Arnar Birgisson, 2014-04-25 17:05:55]

The CQ bit was checked by arnarb@chromium.org

[commit-bot: I haz the power, 2014-04-25 21:42:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/arnarb@chromium.org/249913002/20001

[commit-bot: I haz the power, 2014-04-25 22:33:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-25 22:33:51]

Try jobs failed on following builders:
  tryserver.chromium on chromium_presubmit

[Arnar Birgisson, 2014-04-28 16:21:59]

The CQ bit was checked by arnarb@chromium.org

[Arnar Birgisson, 2014-04-28 16:22:02]

The CQ bit was unchecked by arnarb@chromium.org

[Arnar Birgisson, 2014-04-28 16:22:07]

The CQ bit was checked by arnarb@chromium.org

[commit-bot: I haz the power, 2014-04-28 16:22:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/arnarb@chromium.org/249913002/40001

[commit-bot: I haz the power, 2014-04-28 16:22:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-28 16:22:50]

Failed to apply patch for
chrome/common/extensions/api/_permission_features.json:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/common/extensions/api/_permission_features.json
  Hunk #1 FAILED at 449.
  Hunk #2 FAILED at 893.
  2 out of 2 hunks FAILED -- saving rejects to file
chrome/common/extensions/api/_permission_features.json.rej

Patch:       chrome/common/extensions/api/_permission_features.json
Index: chrome/common/extensions/api/_permission_features.json
diff --git a/chrome/common/extensions/api/_permission_features.json
b/chrome/common/extensions/api/_permission_features.json
index
1c2e593a4d2b7dec30c5508c539558784b13b621..03f86df49dd16810e8e05dcdcb15fb5973a0dc59
100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -449,10 +449,19 @@
       "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
-  "hid": {
-    "channel": "dev",
-    "extension_types": ["platform_app"]
-  },
+  "hid": [
+    {
+      "channel": "dev",
+      "extension_types": ["platform_app"]
+    },
+    {
+      "channel": "stable",
+      "extension_types": ["extension"],
+      "whitelist": [
+        "E24F1786D842E91E74C27929B0B3715A4689A473"  // CryptoToken
+      ]
+    }
+  ],
   "history": {
     "channel": "stable",
     "extension_types": ["extension", "legacy_packaged_app"]
@@ -893,14 +902,32 @@
       "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
-  "usb": {
-    "channel": "stable",
-    "extension_types": ["platform_app"]
-  },
-  "usbDevices": {
-    "channel": "stable",
-    "extension_types": ["platform_app"]
-  },
+  "usb": [
+    {
+      "channel": "stable",
+      "extension_types": ["platform_app"]
+    },
+    {
+      "channel": "stable",
+      "extension_types": ["extension"],
+      "whitelist": [
+        "E24F1786D842E91E74C27929B0B3715A4689A473"  // CryptoToken
+      ]
+    }
+  ],
+  "usbDevices": [
+    {
+      "channel": "stable",
+      "extension_types": ["platform_app"]
+    },
+    {
+      "channel": "stable",
+      "extension_types": ["extension"],
+      "whitelist": [
+        "E24F1786D842E91E74C27929B0B3715A4689A473"  // CryptoToken
+      ]
+    }
+  ],
   "videoCapture": [
     {
       "channel": "stable",

[Arnar Birgisson, 2014-04-28 16:22:55]

The CQ bit was unchecked by arnarb@chromium.org

[xiyuan, 2014-04-28 20:16:11]

The CQ bit was checked by xiyuan@chromium.org

[commit-bot: I haz the power, 2014-04-28 20:17:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/arnarb@chromium.org/249913002/60001

[commit-bot: I haz the power, 2014-04-28 20:17:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-28 20:17:44]

Failed to apply patch for
chrome/common/extensions/api/_permission_features.json:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/common/extensions/api/_permission_features.json
  Hunk #1 succeeded at 435 (offset -23 lines).
  Hunk #2 succeeded at 894 (offset -18 lines).
  Hunk #3 FAILED at 926.
  1 out of 3 hunks FAILED -- saving rejects to file
chrome/common/extensions/api/_permission_features.json.rej

Patch:       chrome/common/extensions/api/_permission_features.json
Index: chrome/common/extensions/api/_permission_features.json
diff --git a/chrome/common/extensions/api/_permission_features.json
b/chrome/common/extensions/api/_permission_features.json
index
52b45ac1112213055c25a2e51fa5dcfa9ab3b2c0..8727eefef52816d96b4bb3d65a01fc3fa19ee123
100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -458,7 +458,8 @@
       "channel": "stable",
       "extension_types": ["extension"],
       "whitelist": [
-        "496B6890097EB6E19809ADEADD095A8721FBB2E0"   // FIDO U2F APIs
+        "496B6890097EB6E19809ADEADD095A8721FBB2E0",  // FIDO U2F APIs
+        "E24F1786D842E91E74C27929B0B3715A4689A473"   // CryptoToken
       ]
     }
   ],
@@ -911,7 +912,8 @@
       "channel": "stable",
       "extension_types": ["extension"],
       "whitelist": [
-        "496B6890097EB6E19809ADEADD095A8721FBB2E0"   // FIDO U2F APIs
+        "496B6890097EB6E19809ADEADD095A8721FBB2E0",  // FIDO U2F APIs
+        "E24F1786D842E91E74C27929B0B3715A4689A473"   // CryptoToken
       ]
     }
   ],
@@ -924,7 +926,8 @@
       "channel": "stable",
       "extension_types": ["extension"],
       "whitelist": [
-        "496B6890097EB6E19809ADEADD095A8721FBB2E0"   // FIDO U2F APIs
+        "496B6890097EB6E19809ADEADD095A8721FBB2E0",  // FIDO U2F APIs
+        "E24F1786D842E91E74C27929B0B3715A4689A473"   // CryptoToken
       ]
     }
   ],

[Arnar Birgisson, 2014-04-28 21:00:08]

The CQ bit was checked by arnarb@chromium.org

[commit-bot: I haz the power, 2014-04-28 21:01:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/arnarb@chromium.org/249913002/80001

[commit-bot: I haz the power, 2014-04-28 21:03:25]

Change committed as 266655