Commit ba7f06eb authored by Russ Hamilton's avatar Russ Hamilton Committed by Commit Bot

Revert "Instrument WebUSB.getDevices/requestDevice for Identifiability study."

This reverts commit f3134574.

Reason for revert: WebUSB devices are too identifying to instrument per identifiability privacy study.

Original change's description:
> Instrument WebUSB.getDevices/requestDevice for Identifiability study.
>
> Bug: 973801
> Change-Id: Ia87925e48d9f0953b5f4e3a2d89472129e4ecee7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2432424
> Reviewed-by: Reilly Grant <reillyg@chromium.org>
> Commit-Queue: Russ Hamilton <behamilton@google.com>
> Cr-Commit-Position: refs/heads/master@{#811456}

TBR=reillyg@chromium.org,behamilton@google.com

Change-Id: I873fa51c11d3cd851ef6d8dc4bbf80cd33aa761a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 973801
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2437699Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Commit-Queue: Russ Hamilton <behamilton@google.com>
Cr-Commit-Position: refs/heads/master@{#811786}
parent 94fd177e
......@@ -10,9 +10,6 @@
#include "services/device/public/mojom/usb_device.mojom-blink.h"
#include "services/device/public/mojom/usb_enumeration_options.mojom-blink.h"
#include "third_party/blink/public/common/browser_interface_broker_proxy.h"
#include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
#include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
#include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-blink.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
......@@ -27,9 +24,7 @@
#include "third_party/blink/renderer/modules/webusb/usb_device.h"
#include "third_party/blink/renderer/platform/bindings/exception_state.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
#include "third_party/blink/renderer/platform/instrumentation/use_counter.h"
#include "third_party/blink/renderer/platform/mojo/mojo_helper.h"
#include "third_party/blink/renderer/platform/privacy_budget/identifiability_digest_helpers.h"
#include "third_party/blink/renderer/platform/wtf/functional.h"
using device::mojom::blink::UsbDevice;
......@@ -192,31 +187,7 @@ void USB::ContextDestroyed() {
get_permission_requests_.clear();
}
namespace {
void RecordDevice(LocalFrame* frame, const UsbDeviceInfoPtr& device_info) {
IdentifiableSurface s = IdentifiableSurface::FromTypeAndToken(
IdentifiableSurface::Type::kWebFeature, WebFeature::kUsbGetDevices);
if (!IdentifiabilityStudySettings::Get()->IsSurfaceAllowed(s))
return;
DCHECK(frame && frame->GetDocument());
Document* document = frame->GetDocument();
IdentifiableTokenBuilder builder;
builder.AddToken(device_info->vendor_id);
builder.AddToken(device_info->product_id);
builder.AddToken(
IdentifiabilitySensitiveStringToken(device_info->serial_number));
IdentifiabilityMetricBuilder(document->UkmSourceID())
.Set(s, builder.GetToken())
.Record(document->UkmRecorder());
}
} // namespace
USBDevice* USB::GetOrCreateDevice(UsbDeviceInfoPtr device_info) {
RecordDevice(GetFrame(), device_info);
USBDevice* device = device_cache_.at(device_info->guid);
if (!device) {
String guid = device_info->guid;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment