Commit aaa6ca07 authored by Sean Harrison's avatar Sean Harrison Committed by Commit Bot

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
...@@ -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 */
......
...@@ -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/
......
...@@ -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