chore: allow advertising for non-testing (#35723)

Author: pavelfeldman

packages/playwright-core/src/protocol/validator.ts

@@ -539,6 +539,7 @@ scheme.BrowserTypeLaunchParams = tObject({
   args: tOptional(tArray(tString)),
   ignoreAllDefaultArgs: tOptional(tBoolean),
   ignoreDefaultArgs: tOptional(tArray(tString)),
+  assistantMode: tOptional(tBoolean),
   handleSIGINT: tOptional(tBoolean),
   handleSIGTERM: tOptional(tBoolean),
   handleSIGHUP: tOptional(tBoolean),
@@ -568,6 +569,7 @@ scheme.BrowserTypeLaunchPersistentContextParams = tObject({
   args: tOptional(tArray(tString)),
   ignoreAllDefaultArgs: tOptional(tBoolean),
   ignoreDefaultArgs: tOptional(tArray(tString)),
+  assistantMode: tOptional(tBoolean),
   handleSIGINT: tOptional(tBoolean),
   handleSIGTERM: tOptional(tBoolean),
   handleSIGHUP: tOptional(tBoolean),

packages/playwright-core/src/server/android/android.ts

@@ -285,7 +285,7 @@ export class AndroidDevice extends SdkObject {
       '--disable-fre',
       '--no-default-browser-check',
       `--remote-debugging-socket-name=${socketName}`,
-      ...chromiumSwitches,
+      ...chromiumSwitches(),
       ...this._innerDefaultArgs(options)
     ];
     return chromeArguments;

packages/playwright-core/src/server/bidi/bidiChromium.ts

@@ -104,7 +104,7 @@ export class BidiChromium extends BrowserType {
       throw new Error('Playwright manages remote debugging connection itself.');
     if (args.find(arg => !arg.startsWith('-')))
       throw new Error('Arguments can not specify page to be opened');
-    const chromeArguments = [...chromiumSwitches];
+    const chromeArguments = [...chromiumSwitches(options.assistantMode)];
 
     if (os.platform() === 'darwin') {
       // See https://github.com/microsoft/playwright/issues/7362

packages/playwright-core/src/server/chromium/chromium.ts

@@ -296,7 +296,7 @@ export class Chromium extends BrowserType {
       throw new Error('Playwright manages remote debugging connection itself.');
     if (args.find(arg => !arg.startsWith('-')))
       throw new Error('Arguments can not specify page to be opened');
-    const chromeArguments = [...chromiumSwitches];
+    const chromeArguments = [...chromiumSwitches(options.assistantMode)];
 
     if (os.platform() === 'darwin') {
       // See https://github.com/microsoft/playwright/issues/7362

packages/playwright-core/src/server/chromium/chromiumSwitches.ts

@@ -17,7 +17,7 @@
 
 // No dependencies as it is used from the Electron loader.
 
-const disabledFeatures = [
+const disabledFeatures = (assistantMode?: boolean) => [
   // See https://github.com/microsoft/playwright/pull/10380
   'AcceptCHFrame',
   // See https://github.com/microsoft/playwright/pull/10679
@@ -47,9 +47,10 @@ const disabledFeatures = [
   'ThirdPartyStoragePartitioning',
   // See https://github.com/microsoft/playwright/issues/16126
   'Translate',
-];
+  assistantMode ? 'AutomationControlled' : '',
+].filter(Boolean);
 
-export const chromiumSwitches = [
+export const chromiumSwitches = (assistantMode?: boolean) => [
   '--disable-field-trial-config', // https://source.chromium.org/chromium/chromium/src/+/main:testing/variations/README.md
   '--disable-background-networking',
   '--disable-background-timer-throttling',
@@ -63,7 +64,7 @@ export const chromiumSwitches = [
   '--disable-default-apps',
   '--disable-dev-shm-usage',
   '--disable-extensions',
-  '--disable-features=' + disabledFeatures.join(','),
+  '--disable-features=' + disabledFeatures(assistantMode).join(','),
   '--allow-pre-commit-input',
   '--disable-hang-monitor',
   '--disable-ipc-flooding-protection',
@@ -73,7 +74,6 @@ export const chromiumSwitches = [
   '--force-color-profile=srgb',
   '--metrics-recording-only',
   '--no-first-run',
-  '--enable-automation',
   '--password-store=basic',
   '--use-mock-keychain',
   // See https://chromium-review.googlesource.com/c/chromium/src/+/2436773
@@ -83,4 +83,5 @@ export const chromiumSwitches = [
   '--disable-search-engine-choice-screen',
   // https://issues.chromium.org/41491762
   '--unsafely-disable-devtools-self-xss-warnings',
-];
+  assistantMode ? '' : '--enable-automation',
+].filter(Boolean);

packages/playwright-core/src/server/electron/loader.ts

@@ -23,7 +23,7 @@ const { chromiumSwitches } = require('../chromium/chromiumSwitches');
 // [Electron, -r, loader.js[, --no-sandbox>], --inspect=0, --remote-debugging-port=0, ...args]
 process.argv.splice(1, process.argv.indexOf('--remote-debugging-port=0'));
 
-for (const arg of chromiumSwitches) {
+for (const arg of chromiumSwitches()) {
   const match = arg.match(/--([^=]*)=?(.*)/)!;
   app.commandLine.appendSwitch(match[1], match[2]);
 }

packages/playwright-core/src/server/types.ts

@@ -155,6 +155,7 @@ export type EmulatedSize = { viewport: Size, screen: Size };
 export type LaunchOptions = channels.BrowserTypeLaunchOptions & {
   webSocketPort?: number,
   proxyOverride?: ProxySettings,
+  assistantMode?: boolean,
 };
 
 export type BrowserContextOptions = channels.BrowserNewContextOptions & {

packages/protocol/src/channels.d.ts

@@ -949,6 +949,7 @@ export type BrowserTypeLaunchParams = {
   args?: string[],
   ignoreAllDefaultArgs?: boolean,
   ignoreDefaultArgs?: string[],
+  assistantMode?: boolean,
   handleSIGINT?: boolean,
   handleSIGTERM?: boolean,
   handleSIGHUP?: boolean,
@@ -975,6 +976,7 @@ export type BrowserTypeLaunchOptions = {
   args?: string[],
   ignoreAllDefaultArgs?: boolean,
   ignoreDefaultArgs?: string[],
+  assistantMode?: boolean,
   handleSIGINT?: boolean,
   handleSIGTERM?: boolean,
   handleSIGHUP?: boolean,
@@ -1004,6 +1006,7 @@ export type BrowserTypeLaunchPersistentContextParams = {
   args?: string[],
   ignoreAllDefaultArgs?: boolean,
   ignoreDefaultArgs?: string[],
+  assistantMode?: boolean,
   handleSIGINT?: boolean,
   handleSIGTERM?: boolean,
   handleSIGHUP?: boolean,
@@ -1086,6 +1089,7 @@ export type BrowserTypeLaunchPersistentContextOptions = {
   args?: string[],
   ignoreAllDefaultArgs?: boolean,
   ignoreDefaultArgs?: string[],
+  assistantMode?: boolean,
   handleSIGINT?: boolean,
   handleSIGTERM?: boolean,
   handleSIGHUP?: boolean,

packages/protocol/src/protocol.yml

@@ -475,6 +475,7 @@ LaunchOptions:
     ignoreDefaultArgs:
       type: array?
       items: string
+    assistantMode: boolean?
     handleSIGINT: boolean?
     handleSIGTERM: boolean?
     handleSIGHUP: boolean?

tests/webview2/webView2Test.ts

@@ -41,7 +41,7 @@ export const webView2Test = baseTest.extend<TraceViewerFixtures>(traceViewerFixt
       shell: true,
       env: {
         ...process.env,
-        WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS: `--remote-debugging-port=${cdpPort} ${chromiumSwitches.join(' ')}`,
+        WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS: `--remote-debugging-port=${cdpPort} ${chromiumSwitches().join(' ')}`,
         WEBVIEW2_USER_DATA_FOLDER: path.join(fs.realpathSync.native(os.tmpdir()), `playwright-webview2-tests/user-data-dir-${testInfo.workerIndex}`),
       }
     });