Allow the Dactyloscoper to handle optional values.

Bug: 973801
Change-Id: Ibe6dcee62b3fcbae9ad6dddcb200cf1df81bd077
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2350360Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Caleb Raitto <caraitto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799352}

third_party/blink/renderer/core/frame/dactyloscoper.h

@@ -5,7 +5,9 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_DACTYLOSCOPER_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_DACTYLOSCOPER_H_
 
+#include "base/optional.h"
 #include "third_party/blink/public/common/privacy_budget/identifiable_token.h"
+#include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/frame/web_feature.h"
 #include "third_party/blink/renderer/core/svg/svg_string_list_tear_off.h"
@@ -45,6 +47,18 @@ class CORE_EXPORT Dactyloscoper {
                                   WebFeature,
                                   SVGStringListTearOff*);
 
+  template <typename T>
+  static void RecordDirectSurface(ExecutionContext* context,
+                                  WebFeature feature,
+                                  const base::Optional<T>& value) {
+    if (value.has_value()) {
+      RecordDirectSurface(context, feature, value.value());
+    } else {
+      RecordDirectSurface(context, feature,
+                          IdentifiableTokenBuilder().GetToken());
+    }
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(Dactyloscoper);
 };