Merge branch 'ChromeDevTools:main' into main

Author: tysonthomas9

DEPS

@@ -15,24 +15,24 @@ vars = {
   'build_revision': 'e13953ced04ed05f45aa3c961bd6d802aced74ec',
 
   'buildtools_url': 'https://chromium.googlesource.com/chromium/src/buildtools.git',
-  'buildtools_revision': '8f29aa25232198e7955c675f6f66d6d6e1f04d73',
+  'buildtools_revision': '64b9f65d16a4de27d1d3e7d880ddc983f281151f',
 
   'depot_tools_url': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
-  'depot_tools_revision': '3be09c6d74ab3e69c99a4dfef5cac79d075b7142',
+  'depot_tools_revision': 'd255a8d41e7a2fdc6b50fee69e70014f875d47ef',
 
   'inspector_protocol_url': 'https://chromium.googlesource.com/deps/inspector_protocol',
   'inspector_protocol_revision': '6d1ae0f13aae6ad381ca31b17b88a0f5af29ca94',
 
   # Keeping track of the last time we rollerd the browser protocol files.
-  'chromium_browser_protocol_revision' : '1cbea9a67e6b8a957e370ab258e26bbdae9cbd29',
+  'chromium_browser_protocol_revision' : 'd2038f87e77355d9568c6446169e2e3f07197ee8',
 
   'clang_format_url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git',
   'clang_format_revision': '37f6e68a107df43b7d7e044fd36a13cbae3413f2',
 
   'emscripten_tag': 'ade9d780ff17c88d81aa13860361743e3c1e1396',
 
   # GN CIPD package version.
-  'gn_version': 'git_revision:a84e399f9999003472192286abc03d752c9cb1f0',
+  'gn_version': 'git_revision:e5c4d1881b85b82789b7013233a944cf1a46370f',
 
   'cmake_version': 'version:2@3.21.3',
 
@@ -49,7 +49,7 @@ vars = {
   # Chrome version used for tests. It should be regularly updated to
   # match the Canary version listed here:
   # https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json
-  'chrome': '139.0.7211.0',
+  'chrome': '139.0.7222.0',
 
   # 'magic' text to tell depot_tools that git submodules should be accepted but
   # but parity with DEPS file is expected.
@@ -59,7 +59,7 @@ vars = {
   'non_git_source': 'True',
 
   # siso CIPD package version
-  'siso_version': 'git_revision:df8adf712c5b5605b438fdfcd44235107811e5ef',
+  'siso_version': 'git_revision:963177240b1a36697c9762856f51ad36ab545ceb',
 }
 
 # Only these hosts are allowed for dependencies in this DEPS file.

buildtools

@@ -1,4 +1,5 @@
 alexschulze@chromium.org
+alexrudenko@chromium.org
 dsv@chromium.org
 jacktfranklin@chromium.org
 liviurau@chromium.org

config/owner/INFRA_OWNERS

@@ -7,9 +7,9 @@ import eslintPlugin from 'eslint-plugin-eslint-plugin';
 import importPlugin from 'eslint-plugin-import';
 import jsdocPlugin from 'eslint-plugin-jsdoc';
 import mochaPlugin from 'eslint-plugin-mocha';
-import { defineConfig, globalIgnores } from 'eslint/config';
+import {defineConfig, globalIgnores} from 'eslint/config';
 import globals from 'globals';
-import { join } from 'path';
+import {join} from 'path';
 import typescriptEslint from 'typescript-eslint';
 
 import rulesdirPlugin from './scripts/eslint_rules/rules-dir.mjs';
@@ -193,7 +193,7 @@ export default defineConfig([
       radix: 'error',
       'valid-typeof': 'error',
       'no-return-assign': ['error', 'always'],
-      'no-implicit-coercion': ['error', { allow: ['!!'] }],
+      'no-implicit-coercion': ['error', {allow: ['!!']}],
 
       'no-array-constructor': 'error',
 
@@ -305,11 +305,11 @@ export default defineConfig([
       parserOptions: {
         allowAutomaticSingleRunInference: true,
         project: join(
-          import.meta.dirname,
-          'config',
-          'typescript',
-          'tsconfig.eslint.json',
-        ),
+            import.meta.dirname,
+            'config',
+            'typescript',
+            'tsconfig.eslint.json',
+            ),
       },
     },
 
@@ -554,12 +554,12 @@ export default defineConfig([
         {
           // Enforce that any import of models/trace/trace.js names the import Trace.
           modulePath: join(
-            import.meta.dirname,
-            'front_end',
-            'models',
-            'trace',
-            'trace.js',
-          ),
+              import.meta.dirname,
+              'front_end',
+              'models',
+              'trace',
+              'trace.js',
+              ),
           importName: 'Trace',
         },
       ],
@@ -704,7 +704,7 @@ export default defineConfig([
       'rulesdir/prefer-sinon-assert': 'error',
       'rulesdir/prefer-url-string': 'error',
       'rulesdir/trace-engine-test-timeouts': 'error',
-      'rulesdir/no-widget-show-document-body': 'error',
+      'rulesdir/no-document-body-mutation': 'error',
       'rulesdir/enforce-custom-element-definitions-location': 'off',
     },
 

eslint.config.mjs

@@ -620,6 +620,68 @@ describe('updateVersionFrom37To38', () => {
   });
 });
 
+describe('updateVersionFrom38To39', () => {
+  let settings: Common.Settings.Settings;
+  let setting: Common.Settings.Setting<{title: string, i18nTitleKey: string}>;
+
+  beforeEach(() => {
+    const mockStore = new MockStore();
+    const syncedStorage = new Common.Settings.SettingsStorage({}, mockStore);
+    const globalStorage = new Common.Settings.SettingsStorage({}, mockStore);
+    const localStorage = new Common.Settings.SettingsStorage({}, mockStore);
+
+    settings = Common.Settings.Settings.instance({
+      forceNew: true,
+      syncedStorage,
+      globalStorage,
+      localStorage,
+    });
+    setting = settings.createSetting('preferred-network-condition', {title: 'Offline', i18nTitleKey: 'Offline'});
+  });
+
+  afterEach(() => {
+    Common.Settings.Settings.removeInstance();
+    Common.Settings.resetSettings();  // Clear SettingsRegistrations.
+  });
+
+  it('renames the preferred-network-condition for "Slow 3G"', async () => {
+    setting.set({title: 'Slow 3G', i18nTitleKey: 'Slow 3G'});
+    const versionController = new VersionController();
+    versionController.updateVersionFrom38To39();
+    const newSetting = await setting.forceGet();
+    assert.strictEqual(newSetting.title, '3G');
+    assert.strictEqual(newSetting.i18nTitleKey, '3G');
+  });
+
+  it('renames the preferred-network-condition for "Fast 3G"', async () => {
+    setting.set({title: 'Fast 3G', i18nTitleKey: 'Fast 3G'});
+    const versionController = new VersionController();
+    versionController.updateVersionFrom38To39();
+    const newSetting = await setting.forceGet();
+    assert.strictEqual(newSetting.title, 'Slow 4G');
+    assert.strictEqual(newSetting.i18nTitleKey, 'Slow 4G');
+  });
+
+  it('does not rename any other setting', async () => {
+    setting.set({title: 'Slow 4G', i18nTitleKey: 'Slow 4G'});
+    const versionController = new VersionController();
+    versionController.updateVersionFrom38To39();
+    const newSetting = await setting.forceGet();
+    assert.strictEqual(newSetting.title, 'Slow 4G');
+    assert.strictEqual(newSetting.i18nTitleKey, 'Slow 4G');
+  });
+
+  it('deletes the setting if it does not parse as valid JSON', async () => {
+    setting.set({title: 'Slow 4G', i18nTitleKey: 'Slow 4G'});
+    sinon.stub(JSON, 'parse').callsFake(() => {
+      throw new Error('Invalid JSON');
+    });
+    const versionController = new VersionController();
+    versionController.updateVersionFrom38To39();
+    assert.isFalse(settings.globalStorage.has('preferred-network-condition'));
+  });
+});
+
 describe('access logging', () => {
   let settings: Common.Settings.Settings;
   let logSettingAccess!: sinon.SinonSpy;

front_end/core/common/Settings.test.ts

@@ -438,11 +438,14 @@ export class Setting<V> {
   }
 
   #maybeLogAccess(value: V): void {
-    const valueToLog = typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean' ?
-        value :
-        this.#serializer?.stringify(value);
-    if (valueToLog !== undefined && this.#logSettingAccess) {
-      void this.#logSettingAccess(this.name, valueToLog);
+    try {
+      const valueToLog = typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean' ?
+          value :
+          this.#serializer?.stringify(value);
+      if (valueToLog !== undefined && this.#logSettingAccess) {
+        void this.#logSettingAccess(this.name, valueToLog);
+      }
+    } catch {
     }
   }
 
@@ -671,7 +674,7 @@ export class VersionController {
   static readonly SYNCED_VERSION_SETTING_NAME = 'syncedInspectorVersion';
   static readonly LOCAL_VERSION_SETTING_NAME = 'localInspectorVersion';
 
-  static readonly CURRENT_VERSION = 38;
+  static readonly CURRENT_VERSION = 39;
 
   readonly #globalVersionSetting: Setting<number>;
   readonly #syncedVersionSetting: Setting<number>;
@@ -1322,6 +1325,40 @@ export class VersionController {
     }
   }
 
+  updateVersionFrom38To39(): void {
+    const PREFERRED_NETWORK_COND = 'preferred-network-condition';
+    // crrev.com/c/5582013 renamed "Slow 3G" to "3G" and "Fast 3G" => "Slow 4G".
+    // Any users with the old values need to have them moved to avoid breaking DevTools.
+    // Note: we load the raw value via the globalStorage here because
+    // `createSetting` creates if it is not present, and we do not want that;
+    // we only want to update existing, old values.
+    const setting = Settings.instance().globalStorage.get(PREFERRED_NETWORK_COND);
+    if (!setting) {
+      return;
+    }
+    try {
+      const networkSetting = JSON.parse(setting) as unknown as {
+        // Can't use SDK type here as it creates a common<>sdk circular
+        // dep. This type is not exhaustive but contains the fields we
+        // need.
+        title: string,
+        i18nTitleKey?: string,
+      };
+      if (networkSetting.title === 'Slow 3G') {
+        networkSetting.title = '3G';
+        networkSetting.i18nTitleKey = '3G';
+        Settings.instance().globalStorage.set(PREFERRED_NETWORK_COND, JSON.stringify(networkSetting));
+      } else if (networkSetting.title === 'Fast 3G') {
+        networkSetting.title = 'Slow 4G';
+        networkSetting.i18nTitleKey = 'Slow 4G';
+        Settings.instance().globalStorage.set(PREFERRED_NETWORK_COND, JSON.stringify(networkSetting));
+      }
+    } catch {
+      // If parsing the setting threw, it's in some invalid state, so remove it.
+      Settings.instance().globalStorage.remove(PREFERRED_NETWORK_COND);
+    }
+  }
+
   /*
    * Any new migration should be added before this comment.
    *