collapsed to a single setting

Change-Id: I3886ba86705ce423ccf8024133bc58fff16fa6c8

Author: paulirish

src/tools/performance.ts

@@ -178,8 +178,12 @@ export const toggleCrux = defineTool({
   handler: async (request, response) => {
     try {
       const settings = DevTools.Common.Settings.Settings.instance();
-      const cruxSetting = settings.createSetting('field-data-enabled', true);
-      cruxSetting.set(request.params.enabled);
+      const cruxSetting = settings.createSetting(
+        'field-data',
+        {enabled: false},
+        DevTools.Common.Settings.SettingStorageType.GLOBAL,
+      );
+      cruxSetting.set({...cruxSetting.get(), enabled: request.params.enabled});
       response.appendResponseLine(
         `CrUX data fetching has been ${request.params.enabled ? 'enabled' : 'disabled'}.`,
       );

src/utils/crux.ts

@@ -185,8 +185,13 @@ export async function populateCruxData(
   ensureCrUXManager();
   try {
     const settings = DevTools.Common.Settings.Settings.instance();
-    const cruxSetting = settings.createSetting('field-data-enabled', true);
-    if (!cruxSetting.get()) {
+    const cruxSetting = settings.createSetting<ConfigSetting>(
+      'field-data',
+      {enabled: false},
+      DevTools.Common.Settings.SettingStorageType.GLOBAL,
+    );
+
+    if (!cruxSetting.get().enabled) {
       return;
     }
   } catch {

tests/utils/crux.test.ts

@@ -16,6 +16,7 @@ import {
   traceResultIsSuccess,
 } from '../../src/trace-processing/parse.js';
 import {populateCruxData} from '../../src/utils/crux.js';
+import {ensureCrUXManager} from '../../src/utils/crux.js';
 import {loadTraceAsBuffer} from '../trace-processing/fixtures/load.js';
 
 describe('crux util', () => {
@@ -69,6 +70,9 @@ describe('crux util', () => {
       .stub(DevTools.CrUXManager.CrUXManager, 'instance')
       .returns(mockCrUXManager as any);
 
+    const settings = DevTools.Common.Settings.Settings.instance();
+    settings.createSetting('field-data', {enabled: false}).set({enabled: true});
+
     await populateCruxData(result.parsedTrace);
     const summary = getTraceSummary(result);
 
@@ -111,6 +115,9 @@ describe('crux util', () => {
       json: async () => mockResponse,
     } as Response);
 
+    const settings = DevTools.Common.Settings.Settings.instance();
+    settings.createSetting('field-data', {enabled: false}).set({enabled: true});
+
     await populateCruxData(fakeParsedTrace);
 
     assert.ok(fakeParsedTrace.metadata.cruxFieldData);
@@ -145,6 +152,9 @@ describe('crux util', () => {
       status: 404,
     } as Response);
 
+    const settings = DevTools.Common.Settings.Settings.instance();
+    settings.createSetting('field-data', {enabled: false}).set({enabled: true});
+
     await populateCruxData(fakeParsedTrace);
 
     assert.ok(fakeParsedTrace.metadata.cruxFieldData);