Skip to content

GitLab

T
tangled
Commit aaa6ca07 authored by Sean Harrison's avatar Sean Harrison Committed by Commit Bot
Browse files
Options

Add missing enums to SettingsPageInteraction enum 

Add:
PRIVACY_SITE_SETTINGS_ALL
PRIVACY_SITE_SETTINGS_AR
PRIVACY_SITE_SETTINGS_VR

These were missed in a previous CL and hits a DCHECK

Add corresponding test to site_settings_page_test.js

Merge all tests into one to remove flakiness, testing each logging call in a separate test was taking too long and causing sporadic timeouts resulting in flakiness.

Now all logging checks are done by navigating around a single test instance and resetting proxy state, speed up removes all flakiness and was significant enough to allow the merging of all 4 split test suites without timeout concerns.

Bug: 1046488, 1048858
Change-Id: I074e2581d3489e179adfdc187e7165284ccc2685
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2027447
Commit-Queue: Sean Harrison <harrisonsean@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738512}
parent 560e52cc
Hide whitespace changes
Inline Side-by-side
Showing with 289 additions and 345 deletions
chrome/browser/resources/settings/metrics_browser_proxy.js
View file @ aaa6ca07
...@@ -55,8 +55,11 @@ cr.define('settings', function() { ...@@ -55,8 +55,11 @@ cr.define('settings', function() {
PRIVACY_SITE_SETTINGS_PAYMENT_HANDLER: 36, PRIVACY_SITE_SETTINGS_PAYMENT_HANDLER: 36,
PRIVACY_SITE_SETTINGS_MIXEDSCRIPT: 37, PRIVACY_SITE_SETTINGS_MIXEDSCRIPT: 37,
PRIVACY_SITE_SETTINGS_BLUETOOTH_SCANNING: 38, PRIVACY_SITE_SETTINGS_BLUETOOTH_SCANNING: 38,
PRIVACY_SITE_SETTINGS_ALL: 39,
PRIVACY_SITE_SETTINGS_AR: 40,
PRIVACY_SITE_SETTINGS_VR: 41,
// Leave this at the end. // Leave this at the end.
SETTINGS_MAX_VALUE: 38, SETTINGS_MAX_VALUE: 41,
}; };
/** @interface */ /** @interface */
......
chrome/test/data/webui/settings/cr_settings_browsertest.js
View file @ aaa6ca07
...@@ -982,21 +982,6 @@ TEST_F('CrSettingsSiteSettingsPageTest', 'UMALoggingTests', function() { ...@@ -982,21 +982,6 @@ TEST_F('CrSettingsSiteSettingsPageTest', 'UMALoggingTests', function() {
mocha.run(); mocha.run();
}); });
TEST_F('CrSettingsSiteSettingsPageTest', 'UMALoggingTestsPart2', function() {
settings_site_settings_page.registerUMALoggingTestsPart2();
mocha.run();
});
TEST_F('CrSettingsSiteSettingsPageTest', 'UMALoggingTestsPart3', function() {
settings_site_settings_page.registerUMALoggingTestsPart3();
mocha.run();
});
TEST_F('CrSettingsSiteSettingsPageTest', 'UMALoggingTestsPart4', function() {
settings_site_settings_page.registerUMALoggingTestsPart4();
mocha.run();
});
/** /**
* Test fixture for * Test fixture for
* chrome/browser/resources/settings/privacy_page/ * chrome/browser/resources/settings/privacy_page/
......
chrome/test/data/webui/settings/site_settings_page_test.js
View file @ aaa6ca07
...@@ -24,390 +24,343 @@ cr.define('settings_site_settings_page', function() { ...@@ -24,390 +24,343 @@ cr.define('settings_site_settings_page', function() {
page.remove(); page.remove();
}); });
test('LogCookiesClick', function() { test('LogAllSiteSettingsPageClicks', async function() {
page.$$('#all-sites').click();
let result =
await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals(
settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_ALL,
result);
settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
page.$$('#cookies').click(); page.$$('#cookies').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_COOKIES,
.PRIVACY_SITE_SETTINGS_COOKIES, result);
result);
}); settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
}); testBrowserProxy.reset();
test('LogLocationClick', function() {
page.$$('#location').click(); page.$$('#location').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_LOCATION,
.PRIVACY_SITE_SETTINGS_LOCATION, result);
result);
}); settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
}); testBrowserProxy.reset();
test('LogCameraClick', function() {
page.$$('#camera').click(); page.$$('#camera').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_CAMERA,
.PRIVACY_SITE_SETTINGS_CAMERA, result);
result);
});
});
test('LogMicrophoneClick', function() { settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
page.$$('#microphone').click(); testBrowserProxy.reset();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram')
.then(result => {
assertEquals(
settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_MICROPHONE,
result);
});
});
test('LogSensorsClick', function() { page.$$('#microphone').click();
page.$$('#sensors').click(); result =
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
.then(result => { assertEquals(
assertEquals( settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_MICROPHONE,
settings.SettingsPageInteractions result);
.PRIVACY_SITE_SETTINGS_SENSORS,
result);
});
});
test('LogNotificationsClick', function() { settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
page.$$('#notifications').click(); testBrowserProxy.reset();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram')
.then(result => {
assertEquals(
settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_NOTIFICATIONS,
result);
});
});
});
}
// Split tests into 4 to prevent timeout. page.$$('#sensors').click();
function registerUMALoggingTestsPart2() { result =
suite('SiteSettingsPageUMACheckPart2', function() { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
/** @type {settings.TestPrivacyPageBrowserProxy} */ assertEquals(
let testBrowserProxy; settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_SENSORS,
result);
/** @type {SettingsSiteSettingsPageElement} */ settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
let page; testBrowserProxy.reset();
setup(function() { page.$$('#notifications').click();
testBrowserProxy = new TestMetricsBrowserProxy(); result =
settings.MetricsBrowserProxyImpl.instance_ = testBrowserProxy; await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
PolymerTest.clearBody(); assertEquals(
page = document.createElement('settings-site-settings-page'); settings.SettingsPageInteractions
document.body.appendChild(page); .PRIVACY_SITE_SETTINGS_NOTIFICATIONS,
Polymer.dom.flush(); result);
});
teardown(function() { settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
page.remove(); testBrowserProxy.reset();
});
test('LogJavascriptClick', function() {
page.$$('#javascript').click(); page.$$('#javascript').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_JAVASCRIPT,
.PRIVACY_SITE_SETTINGS_JAVASCRIPT, result);
result);
}); settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
}); testBrowserProxy.reset();
test('LogFlashClick', function() {
page.$$('#flash').click(); page.$$('#flash').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_FLASH, settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_FLASH,
result); result);
});
}); settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
test('LogImagesClick', function() {
page.$$('#images').click(); page.$$('#images').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_IMAGES,
.PRIVACY_SITE_SETTINGS_IMAGES, result);
result);
}); settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
}); testBrowserProxy.reset();
test('LogPopupsClick', function() {
page.$$('#popups').click(); page.$$('#popups').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_POPUPS,
.PRIVACY_SITE_SETTINGS_POPUPS, result);
result);
}); settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
}); testBrowserProxy.reset();
if (loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter')) {
test('LogAdsClick', function() {
page.$$('#ads').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram')
.then(result => {
assertEquals(
settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_ADS,
result);
});
});
}
test('LogBackgroundSyncClick', function() {
page.$$('#background-sync').click(); page.$$('#background-sync').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_BACKGROUND_SYNC, .PRIVACY_SITE_SETTINGS_BACKGROUND_SYNC,
result); result);
});
});
test('LogSoundClick', function() { settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
page.$$('#sound').click(); testBrowserProxy.reset();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram')
.then(result => {
assertEquals(
settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_SOUND,
result);
});
});
});
}
// Split tests into 4 to prevent timeout. page.$$('#sound').click();
function registerUMALoggingTestsPart3() { result =
suite('SiteSettingsPageUMACheckPart3', function() { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
/** @type {settings.TestPrivacyPageBrowserProxy} */ assertEquals(
let testBrowserProxy; settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_SOUND,
result);
/** @type {SettingsSiteSettingsPageElement} */ if (loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter')) {
let page; settings.Router.getInstance().navigateTo(
settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
setup(function() { page.$$('#ads').click();
testBrowserProxy = new TestMetricsBrowserProxy(); result =
settings.MetricsBrowserProxyImpl.instance_ = testBrowserProxy; await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
PolymerTest.clearBody(); assertEquals(
page = document.createElement('settings-site-settings-page'); settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_ADS,
document.body.appendChild(page); result);
Polymer.dom.flush(); }
});
teardown(function() { settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
page.remove(); testBrowserProxy.reset();
});
test('LogAutomaticDownloadsClick', function() {
page.$$('#automatic-downloads').click(); page.$$('#automatic-downloads').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_AUTOMATIC_DOWNLOADS, .PRIVACY_SITE_SETTINGS_AUTOMATIC_DOWNLOADS,
result); result);
});
}); settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
test('LogUnsandboxedPluginsClick', function() {
page.$$('#unsandboxed-plugins').click(); page.$$('#unsandboxed-plugins').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_UNSANDBOXED_PLUGINS, .PRIVACY_SITE_SETTINGS_UNSANDBOXED_PLUGINS,
result); result);
});
}); if (!loadTimeData.getBoolean('isGuest')) {
settings.Router.getInstance().navigateTo(
settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
if (!loadTimeData.getBoolean('isGuest')) {
test('LogHandlersClick', function() {
page.$$('#protocol-handlers').click(); page.$$('#protocol-handlers').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_HANDLERS,
.PRIVACY_SITE_SETTINGS_HANDLERS, result);
result); }
});
}); settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
} testBrowserProxy.reset();
test('LogMidiDevicesClick', function() {
page.$$('#midi-devices').click(); page.$$('#midi-devices').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_MIDI_DEVICES, .PRIVACY_SITE_SETTINGS_MIDI_DEVICES,
result); result);
});
}); settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
test('LogZoomLevelsClick', function() {
page.$$('#zoom-levels').click(); page.$$('#zoom-levels').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_ZOOM_LEVELS,
.PRIVACY_SITE_SETTINGS_ZOOM_LEVELS, result);
result);
});
});
test('LogUSBDevicesClick', function() { settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
page.$$('#usb-devices').click(); testBrowserProxy.reset();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram')
.then(result => {
assertEquals(
settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_USB_DEVICES,
result);
});
});
test('LogSerialPortsClick', function() { page.$$('#usb-devices').click();
page.$$('#serial-ports').click(); result =
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
.then(result => { assertEquals(
assertEquals( settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_USB_DEVICES,
settings.SettingsPageInteractions result);
.PRIVACY_SITE_SETTINGS_SERIAL_PORTS,
result);
});
});
});
}
// Split tests into 4 to prevent timeout. settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
function registerUMALoggingTestsPart4() { testBrowserProxy.reset();
suite('SiteSettingsPageUMACheckPart4', function() {
/** @type {settings.TestPrivacyPageBrowserProxy} */
let testBrowserProxy;
/** @type {SettingsSiteSettingsPageElement} */ page.$$('#serial-ports').click();
let page; result =
await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals(
settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_SERIAL_PORTS,
result);
if (loadTimeData.getBoolean(
'enableNativeFileSystemWriteContentSetting')) {
settings.Router.getInstance().navigateTo(
settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
setup(function() { page.$$('#native-file-system-write').click();
testBrowserProxy = new TestMetricsBrowserProxy(); result =
settings.MetricsBrowserProxyImpl.instance_ = testBrowserProxy; await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
PolymerTest.clearBody(); assertEquals(
page = document.createElement('settings-site-settings-page'); settings.SettingsPageInteractions
document.body.appendChild(page); .PRIVACY_SITE_SETTINGS_NATIVE_FILE_SYSTEM_WRITE,
Polymer.dom.flush(); result);
}); }
teardown(function() { settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
page.remove(); testBrowserProxy.reset();
});
if (loadTimeData.getBoolean(
'enableNativeFileSystemWriteContentSetting')) {
test('LogNativeFileSystemWriteClick', function() {
page.$$('#native-file-system-write').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram')
.then(result => {
assertEquals(
settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_NATIVE_FILE_SYSTEM_WRITE,
result);
});
});
}
test('LogPDFDocumentsClick', function() {
page.$$('#pdf-documents').click(); page.$$('#pdf-documents').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_PDF_DOCUMENTS, .PRIVACY_SITE_SETTINGS_PDF_DOCUMENTS,
result); result);
});
}); settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
test('LogProtectedContentClick', function() {
page.$$('#protected-content').click(); page.$$('#protected-content').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_PROTECTED_CONTENT, .PRIVACY_SITE_SETTINGS_PROTECTED_CONTENT,
result); result);
});
}); settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
test('LogClipboardClick', function() {
page.$$('#clipboard').click(); page.$$('#clipboard').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_CLIPBOARD,
.PRIVACY_SITE_SETTINGS_CLIPBOARD, result);
result);
}); if (loadTimeData.getBoolean('enablePaymentHandlerContentSetting')) {
}); settings.Router.getInstance().navigateTo(
settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
if (loadTimeData.getBoolean('enablePaymentHandlerContentSetting')) {
test('LogPaymentHandlerClick', function() {
page.$$('#paymentHandler').click(); page.$$('#paymentHandler').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_PAYMENT_HANDLER, .PRIVACY_SITE_SETTINGS_PAYMENT_HANDLER,
result); result);
}); }
});
} if (loadTimeData.getBoolean('enableInsecureContentContentSetting')) {
settings.Router.getInstance().navigateTo(
if (loadTimeData.getBoolean('enableInsecureContentContentSetting')) { settings.routes.SITE_SETTINGS);
test('LogMixedscriptClick', function() { testBrowserProxy.reset();
page.$$('#mixedscript').click(); page.$$('#mixedscript').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_MIXEDSCRIPT, .PRIVACY_SITE_SETTINGS_MIXEDSCRIPT,
result); result);
}); }
});
} if (loadTimeData.getBoolean('enableExperimentalWebPlatformFeatures')) {
settings.Router.getInstance().navigateTo(
if (loadTimeData.getBoolean('enableExperimentalWebPlatformFeatures')) { settings.routes.SITE_SETTINGS);
test('LogBluetoothScanningClick', function() { testBrowserProxy.reset();
page.$$('#bluetooth-scanning').click(); page.$$('#bluetooth-scanning').click();
return testBrowserProxy.whenCalled('recordSettingsPageHistogram') result =
.then(result => { await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals( assertEquals(
settings.SettingsPageInteractions settings.SettingsPageInteractions
.PRIVACY_SITE_SETTINGS_BLUETOOTH_SCANNING, .PRIVACY_SITE_SETTINGS_BLUETOOTH_SCANNING,
result); result);
}); }
});
} if (loadTimeData.getBoolean('enableWebXrContentSetting')) {
settings.Router.getInstance().navigateTo(
settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
page.$$('#ar').click();
result =
await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals(
settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_AR,
result);
settings.Router.getInstance().navigateTo(
settings.routes.SITE_SETTINGS);
testBrowserProxy.reset();
page.$$('#vr').click();
result =
await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
assertEquals(
settings.SettingsPageInteractions.PRIVACY_SITE_SETTINGS_VR,
result);
}
});
}); });
} }
return { return {
registerUMALoggingTests, registerUMALoggingTests,
registerUMALoggingTestsPart2,
registerUMALoggingTestsPart3,
registerUMALoggingTestsPart4,
}; };
}); });
\ No newline at end of file
tools/metrics/histograms/enums.xml
View file @ aaa6ca07
...@@ -58299,6 +58299,9 @@ Called by update_net_trust_anchors.py.--> ...@@ -58299,6 +58299,9 @@ Called by update_net_trust_anchors.py.-->
<int value="36" label="PRIVACY_SITE_SETTINGS_PAYMENT_HANDLER"/> <int value="36" label="PRIVACY_SITE_SETTINGS_PAYMENT_HANDLER"/>
<int value="37" label="PRIVACY_SITE_SETTINGS_MIXEDSCRIPT"/> <int value="37" label="PRIVACY_SITE_SETTINGS_MIXEDSCRIPT"/>
<int value="38" label="PRIVACY_SITE_SETTINGS_BLUETOOTH_SCANNING"/> <int value="38" label="PRIVACY_SITE_SETTINGS_BLUETOOTH_SCANNING"/>
<int value="39" label="PRIVACY_SITE_SETTINGS_ALL"/>
<int value="40" label="PRIVACY_SITE_SETTINGS_AR"/>
<int value="41" label="PRIVACY_SITE_SETTINGS_VR"/>
</enum> </enum>
<enum name="SettingsResetPromptConfigError"> <enum name="SettingsResetPromptConfigError">
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