Use identifiability digest helper for instrumenting NavigatorPlugins for

identifability study.

We prefer using this pattern over casting the string to a sequence of
bytes, and we can also delete the private method I added for the
casting.

Bug: 973801
Change-Id: Ida8b71addf1b473b4b9d5b33b0df9c89fa36a5c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2329912Reviewed-by: Caleb Raitto <caraitto@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Dylan Cutler <dylancutler@google.com>
Cr-Commit-Position: refs/heads/master@{#793589}

third_party/blink/renderer/modules/plugins/navigator_plugins.cc

@@ -11,6 +11,7 @@
 #include "third_party/blink/renderer/core/frame/settings.h"
 #include "third_party/blink/renderer/modules/plugins/dom_mime_type_array.h"
 #include "third_party/blink/renderer/modules/plugins/dom_plugin_array.h"
+#include "third_party/blink/renderer/platform/privacy_budget/identifiability_digest_helpers.h"
 
 namespace blink {
 
@@ -65,14 +66,14 @@ DOMPluginArray* NavigatorPlugins::plugins(LocalFrame* frame) const {
   IdentifiableTokenBuilder builder;
   for (unsigned i = 0; i < result->length(); i++) {
     DOMPlugin* plugin = result->item(i);
-    builder.AddAtomic(StringToBytesSafe(plugin->name()))
-        .AddAtomic(StringToBytesSafe(plugin->description()))
-        .AddAtomic(StringToBytesSafe(plugin->filename()));
+    builder.AddToken(IdentifiabilityBenignStringToken(plugin->name()))
+        .AddToken(IdentifiabilityBenignStringToken(plugin->description()))
+        .AddToken(IdentifiabilityBenignStringToken(plugin->filename()));
     for (unsigned j = 0; j < plugin->length(); j++) {
       DOMMimeType* mimeType = plugin->item(j);
-      builder.AddAtomic(StringToBytesSafe(mimeType->type()))
-          .AddAtomic(StringToBytesSafe(mimeType->description()))
-          .AddAtomic(StringToBytesSafe(mimeType->suffixes()));
+      builder.AddToken(IdentifiabilityBenignStringToken(mimeType->type()))
+          .AddToken(IdentifiabilityBenignStringToken(mimeType->description()))
+          .AddToken(IdentifiabilityBenignStringToken(mimeType->suffixes()));
     }
   }
   // ...and report to UKM.
@@ -83,10 +84,6 @@ DOMPluginArray* NavigatorPlugins::plugins(LocalFrame* frame) const {
   return result;
 }
 
-base::span<const uint8_t> NavigatorPlugins::StringToBytesSafe(String str) const {
-  return str.Is8Bit() ? str.Span8() : as_bytes(str.Span16());
-}
-
 DOMMimeTypeArray* NavigatorPlugins::mimeTypes(LocalFrame* frame) const {
   if (!mime_types_)
     mime_types_ = MakeGarbageCollected<DOMMimeTypeArray>(frame);

third_party/blink/renderer/modules/plugins/navigator_plugins.h

@@ -37,8 +37,6 @@ class NavigatorPlugins final : public GarbageCollected<NavigatorPlugins>,
 
   mutable Member<DOMPluginArray> plugins_;
   mutable Member<DOMMimeTypeArray> mime_types_;
-
-  base::span<const uint8_t> StringToBytesSafe(String str) const;
 };
 
 }  // namespace blink