Settings: Port metrics_browser_proxy to Polymer 3

Bug: 1026426
Change-Id: Id2e3fd7330fe5c4651fc1853261217e56f61df05
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2099026Reviewed-by: dpapad <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749446}

chrome/browser/resources/settings/BUILD.gn

@@ -259,15 +259,13 @@ js_type_check("closure_compile_local_module") {
   is_polymer3 = true
   deps = [
     ":extension_control_browser_proxy.m",
+    ":global_scroll_target_behavior.m",
     ":i18n_setup.m",
 
     # TODO(crbug.com/1026426): Fix and enable.
-    ":global_scroll_target_behavior.m",
-
     #":icons.m",
     ":lifetime_browser_proxy.m",
-
-    #":metrics_browser_proxy.m",
+    ":metrics_browser_proxy.m",
     ":open_window_proxy.m",
     ":page_visibility.m",
     ":plural_string_proxy.m",
@@ -315,9 +313,7 @@ js_library("lifetime_browser_proxy.m") {
 
 js_library("metrics_browser_proxy.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/metrics_browser_proxy.m.js" ]
-  deps = [
-    # TODO: Fill those in.
-  ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
   extra_deps = [ ":modulize" ]
 }
 

chrome/browser/resources/settings/metrics_browser_proxy.js

@@ -4,6 +4,10 @@
 
 /** @fileoverview Handles metrics for the settings pages. */
 
+// clang-format off
+// #import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
+// clang-format on
+
 cr.define('settings', function() {
   /**
    * Contains all possible recorded interactions across privacy settings pages.
@@ -15,7 +19,7 @@ cr.define('settings', function() {
    * histograms/enums.xml
    * @enum {number}
    */
-  const PrivacyElementInteractions = {
+  /* #export */ const PrivacyElementInteractions = {
     SYNC_AND_GOOGLE_SERVICES: 0,
     CHROME_SIGN_IN: 1,
     DO_NOT_TRACK: 2,
@@ -43,7 +47,7 @@ cr.define('settings', function() {
   /**
    * @implements {settings.MetricsBrowserProxy}
    */
-  class MetricsBrowserProxyImpl {
+  /* #export */ class MetricsBrowserProxyImpl {
     /** @override*/
     recordSettingsPageHistogram(interaction) {
       chrome.send('metricsHandler:recordInHistogram', [

chrome/browser/resources/settings/settings.gni

@@ -28,6 +28,7 @@ settings_namespace_rewrites = [
   "settings.LanguagesBrowserProxy|LanguagesBrowserProxy",
   "settings.LifetimeBrowserProxy|LifetimeBrowserProxy",
   "settings.MainPageBehavior|MainPageBehavior",
+  "settings.MetricsBrowserProxy|MetricsBrowserProxy",
   "settings.MinimumRoutes|MinimumRoutes",
   "settings.OnStartupBrowserProxy|OnStartupBrowserProxy",
   "settings.OpenWindowProxy|OpenWindowProxy",
@@ -38,6 +39,7 @@ settings_namespace_rewrites = [
   "Settings.PrefUtil.prefToString|prefToString",
   "Settings.PrefUtil.stringToPrefValue|stringToPrefValue",
   "settings.PrintingBrowserProxy|PrintingBrowserProxy",
+  "settings.PrivacyElementInteractions|PrivacyElementInteractions",
   "settings.ResetBrowserProxy|ResetBrowserProxy",
   "settings.Route|Route",
   "settings.routes|routes",

chrome/browser/resources/settings/settings.js

@@ -81,6 +81,7 @@ export {getSearchManager, SearchRequest, setSearchManagerForTesting} from './sea
 export {kMenuCloseDelay} from './languages_page/languages_page.m.js';
 export {LanguagesBrowserProxyImpl} from './languages_page/languages_browser_proxy.m.js';
 export {LifetimeBrowserProxyImpl} from './lifetime_browser_proxy.m.js';
+export {MetricsBrowserProxyImpl, PrivacyElementInteractions} from './metrics_browser_proxy.m.js';
 export {OnStartupBrowserProxy, OnStartupBrowserProxyImpl} from './on_startup_page/on_startup_browser_proxy.m.js';
 export {EDIT_STARTUP_URL_EVENT} from './on_startup_page/startup_url_entry.m.js';
 export {StartupUrlsPageBrowserProxy, StartupUrlsPageBrowserProxyImpl} from './on_startup_page/startup_urls_page_browser_proxy.m.js';

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -302,6 +302,10 @@
            use_base_dir="false"
            type="BINDATA"
            preprocess="true" />
+  <include name="IDR_SETTINGS_METRICS_BROWSER_PROXY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/metrics_browser_proxy.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ON_STARTUP_PAGE_ON_STARTUP_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/on_startup_browser_proxy.m.js"
            use_base_dir="false"

chrome/test/data/webui/BUILD.gn

@@ -252,6 +252,7 @@ js2gtest("browser_tests_js_webui") {
     "$root_gen_dir/chrome/test/data/webui/settings/site_favicon_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/startup_urls_page_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/test_about_page_browser_proxy.m.js",
+    "$root_gen_dir/chrome/test/data/webui/settings/test_metrics_browser_proxy.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/sync_test_util.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/system_page_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/test_extension_control_browser_proxy.m.js",

chrome/test/data/webui/settings/BUILD.gn

@@ -57,6 +57,7 @@ js_modulizer("modulize") {
     "test_extension_control_browser_proxy.js",
     "test_languages_browser_proxy.js",
     "test_lifetime_browser_proxy.js",
+    "test_metrics_browser_proxy.js",
     "test_open_window_proxy.js",
     "test_password_manager_proxy.js",
     "test_reset_browser_proxy.js",

chrome/test/data/webui/settings/test_metrics_browser_proxy.js

@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/** @implements {settings.PrivacyPageBrowserProxy} */
-class TestMetricsBrowserProxy extends TestBrowserProxy {
+// #import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
+
+/** @implements {settings.MetricsBrowserProxy} */
+/* #export */ class TestMetricsBrowserProxy extends TestBrowserProxy {
   constructor() {
     super([
       'recordSettingsPageHistogram',
@@ -14,4 +16,4 @@ class TestMetricsBrowserProxy extends TestBrowserProxy {
   recordSettingsPageHistogram(value) {
     this.methodCalled('recordSettingsPageHistogram', value);
   }
-}
\ No newline at end of file
+}