Generic boolean UKM recording, and adding UKM for Mobile Menu Find in Page.

Bug: 1015005
Change-Id: Ife3feceddf6e89949eb5ea4e612be71ac3c53ad7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1850313
Commit-Queue: Alexandre Frechette <frechette@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708225}

chrome/android/BUILD.gn

@@ -2490,7 +2490,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/banners/AppBannerUiDelegateAndroid.java",
     "java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java",
     "java/src/org/chromium/chrome/browser/browserservices/OriginVerifier.java",
-    "java/src/org/chromium/chrome/browser/browserservices/UkmRecorder.java",
     "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java",
     "java/src/org/chromium/chrome/browser/browsing_data/UrlFilterBridge.java",
     "java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java",
@@ -2607,6 +2606,7 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/metrics/BackgroundTaskMemoryMetricsEmitter.java",
     "java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java",
     "java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java",
+    "java/src/org/chromium/chrome/browser/metrics/UkmRecorder.java",
     "java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java",
     "java/src/org/chromium/chrome/browser/metrics/UmaUtils.java",
     "java/src/org/chromium/chrome/browser/metrics/VariationsSession.java",

chrome/android/chrome_java_sources.gni

@@ -154,7 +154,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityClient.java",
   "java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivitySettingsLauncher.java",
   "java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityUmaRecorder.java",
-  "java/src/org/chromium/chrome/browser/browserservices/UkmRecorder.java",
   "java/src/org/chromium/chrome/browser/browserservices/VerificationResultStore.java",
   "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java",
   "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/NotificationChannelPreserver.java",
@@ -893,6 +892,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/metrics/PackageMetrics.java",
   "java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java",
   "java/src/org/chromium/chrome/browser/metrics/BackgroundTaskMemoryMetricsEmitter.java",
+  "java/src/org/chromium/chrome/browser/metrics/UkmRecorder.java",
   "java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java",
   "java/src/org/chromium/chrome/browser/metrics/UmaUtils.java",
   "java/src/org/chromium/chrome/browser/metrics/VariationsSession.java",

chrome/android/java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityUmaRecorder.java

@@ -12,6 +12,7 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
+import org.chromium.chrome.browser.metrics.UkmRecorder;
 import org.chromium.chrome.browser.tab.Tab;
 
 import java.lang.annotation.Retention;
@@ -60,7 +61,7 @@ public class TrustedWebActivityUmaRecorder {
     public void recordTwaOpened(@Nullable Tab tab) {
         RecordUserAction.record("BrowserServices.TwaOpened");
         if (tab != null) {
-            new UkmRecorder.Bridge().recordTwaOpened(tab);
+            new UkmRecorder.Bridge().recordEvent(tab.getWebContents(), "TrustedWebActivity.Open");
         }
     }
 

chrome/android/java/src/org/chromium/chrome/browser/browserservices/UkmRecorder.java → chrome/android/java/src/org/chromium/chrome/browser/metrics/UkmRecorder.java

@@ -2,36 +2,48 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.browserservices;
+package org.chromium.chrome.browser.metrics;
 
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
-import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.content_public.browser.WebContents;
 
 /**
- * An interface and classes to record User Keyed Metrics relevant to Trusted Web Activities. This
- * will allow us to concentrate on the use cases for the most used TWAs.
+ * An interface and classes to record User Keyed Metrics.
  */
 public abstract class UkmRecorder {
     /**
-     * Records a TWA has been opened in given tab.
+     * Records the occurrence of a (boolean) UKM event with name |eventName|.
+     * A UKM entry with |eventName| must be present in ukm.xml with a metric named `HasOccured`.
+     * For example,
+     * <event name="SomeFeature.SomeComponent">
+     * <owner>owner@chromium.org</owner>
+     * <summary>
+     * User triggered a specific feature.
+     * </summary>
+     * <metric name="HasOccurred" enum="Boolean">
+     * <summary>
+     * A boolean signaling that the event has occurred (typically only records
+     *  true values).
+     * </summary>
+     * </metric>
+     * </event>
      */
-    abstract void recordTwaOpened(Tab tab);
+    abstract void recordEvent(WebContents webContents, String eventName);
 
     /**
      * The actual recorder.
      */
-    @JNINamespace("browserservices")
-    static class Bridge extends UkmRecorder {
+    @JNINamespace("metrics")
+    public static class Bridge extends UkmRecorder {
         @Override
-        public void recordTwaOpened(Tab tab) {
-            UkmRecorderJni.get().recordOpen(tab.getWebContents());
+        public void recordEvent(WebContents webContents, String eventName) {
+            UkmRecorderJni.get().recordEvent(webContents, eventName);
         }
     }
 
     @NativeMethods
     interface Natives {
-        void recordOpen(WebContents webContents);
+        void recordEvent(WebContents webContents, String eventName);
     }
-}
+}
\ No newline at end of file

chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java

@@ -24,6 +24,8 @@ import org.chromium.chrome.browser.findinpage.FindToolbarManager;
 import org.chromium.chrome.browser.findinpage.FindToolbarObserver;
 import org.chromium.chrome.browser.lifecycle.Destroyable;
 import org.chromium.chrome.browser.lifecycle.InflationObserver;
+import org.chromium.chrome.browser.metrics.UkmRecorder;
+import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.vr.VrModeObserver;
 import org.chromium.chrome.browser.vr.VrModuleProvider;
 import org.chromium.ui.base.DeviceFormFactor;
@@ -136,8 +138,10 @@ public class RootUiCoordinator
 
             mFindToolbarManager.showToolbar();
 
+            Tab tab = mActivity.getActivityTabProvider().get();
             if (fromMenu) {
                 RecordUserAction.record("MobileMenuFindInPage");
+                new UkmRecorder.Bridge().recordEvent(tab.getWebContents(), "MobileMenu.FindInPage");
             } else {
                 RecordUserAction.record("MobileShortcutFindInPage");
             }

chrome/browser/BUILD.gn

@@ -2239,7 +2239,6 @@ jumbo_static_library("browser") {
       "android/bookmarks/partner_bookmarks_shim.h",
       "android/bottombar/overlay_panel_content.cc",
       "android/bottombar/overlay_panel_content.h",
-      "android/browserservices/ukm_recorder.cc",
       "android/browsing_data/browsing_data_bridge.cc",
       "android/browsing_data/browsing_data_counter_bridge.cc",
       "android/browsing_data/browsing_data_counter_bridge.h",
@@ -2475,6 +2474,7 @@ jumbo_static_library("browser") {
       "android/metrics/background_task_memory_metrics_emitter.cc",
       "android/metrics/background_task_memory_metrics_emitter.h",
       "android/metrics/launch_metrics.cc",
+      "android/metrics/ukm_recorder.cc",
       "android/metrics/uma_session_stats.cc",
       "android/metrics/uma_session_stats.h",
       "android/metrics/uma_utils.cc",

chrome/browser/android/browserservices/ukm_recorder.cc → chrome/browser/android/metrics/ukm_recorder.cc

@@ -4,23 +4,28 @@
 
 #include "services/metrics/public/cpp/ukm_recorder.h"
 #include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
 #include "chrome/android/chrome_jni_headers/UkmRecorder_jni.h"
 #include "components/ukm/content/source_url_recorder.h"
 #include "content/public/browser/web_contents.h"
 #include "services/metrics/public/cpp/ukm_builders.h"
+#include "services/metrics/public/cpp/ukm_entry_builder.h"
 
-namespace browserservices {
+namespace metrics {
 
-// Called by Java org.chromium.chrome.browser.browserservices.UkmRecorder.
-static void JNI_UkmRecorder_RecordOpen(
+// Called by Java org.chromium.chrome.browser.metrics.UkmRecorder.
+static void JNI_UkmRecorder_RecordEvent(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& java_web_contents) {
+    const base::android::JavaParamRef<jobject>& j_web_contents,
+    const base::android::JavaParamRef<jstring>& j_event_name) {
   content::WebContents* web_contents =
-      content::WebContents::FromJavaWebContents(java_web_contents);
-  ukm::SourceId source_id =
+      content::WebContents::FromJavaWebContents(j_web_contents);
+  const ukm::SourceId source_id =
       ukm::GetSourceIdForWebContentsDocument(web_contents);
-  ukm::builders::TrustedWebActivity_Open(source_id).Record(
-      ukm::UkmRecorder::Get());
+  const std::string event_name(ConvertJavaStringToUTF8(env, j_event_name));
+  ukm::UkmEntryBuilder builder(source_id, event_name);
+  builder.SetMetric("HasOccurred", true);
+  builder.Record(ukm::UkmRecorder::Get());
 }
 
-}  // namespace browserservices
+}  // namespace metrics

tools/metrics/ukm/ukm.xml

@@ -4934,6 +4934,19 @@ be describing additional metrics about the same event.
   </metric>
 </event>
 
+<event name="MobileMenu.FindInPage">
+  <owner>frechette@chromium.org</owner>
+  <summary>
+    User pressed 'Find in page' in the app menu.
+  </summary>
+  <metric name="HasOccurred" enum="Boolean">
+    <summary>
+      A boolean signaling that the event has occurred (typically only records
+      true values).
+    </summary>
+  </metric>
+</event>
+
 <event name="NavigationPredictorAnchorElementMetrics">
   <owner>ryansturm@chromium.org</owner>
   <summary>
@@ -8298,6 +8311,12 @@ be describing additional metrics about the same event.
   <summary>
     Collected when a page is opened in a Trusted Web Activity.
   </summary>
+  <metric name="HasOccurred" enum="Boolean">
+    <summary>
+      A boolean signaling that the event has occurred (typically only records
+      true values).
+    </summary>
+  </metric>
 </event>
 
 <event name="UserActivity">