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: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738512}

chrome/browser/resources/settings/metrics_browser_proxy.js

@@ -55,8 +55,11 @@ cr.define('settings', function() {
     PRIVACY_SITE_SETTINGS_PAYMENT_HANDLER: 36,
     PRIVACY_SITE_SETTINGS_MIXEDSCRIPT: 37,
     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.
-    SETTINGS_MAX_VALUE: 38,
+    SETTINGS_MAX_VALUE: 41,
   };
 
   /** @interface */

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

@@ -982,21 +982,6 @@ TEST_F('CrSettingsSiteSettingsPageTest', 'UMALoggingTests', function() {
   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
  * chrome/browser/resources/settings/privacy_page/

tools/metrics/histograms/enums.xml

@@ -58299,6 +58299,9 @@ Called by update_net_trust_anchors.py.-->
   <int value="36" label="PRIVACY_SITE_SETTINGS_PAYMENT_HANDLER"/>
   <int value="37" label="PRIVACY_SITE_SETTINGS_MIXEDSCRIPT"/>
   <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 name="SettingsResetPromptConfigError">