nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1572336 - Merge marionette.js into all.js. r=ato

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D41151

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nicholas Nethercote 2019-08-13 23:49:39 +00:00
parent bd33349692
commit 3aa9f46986
6 changed files with 33 additions and 42 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
.prettierignore
View file

@ -30,7 +30,6 @@ modules/libpref/test/unit/data/testPrefSticky.js
modules/libpref/test/unit/extdata/testExt.js
remote/pref/remote.js
services/sync/tests/unit/prefs_test_prefs_store.js
testing/marionette/prefs/marionette.js
# Ignore testing pref files which aren't parsed normally.
testing/profiles/**/user.js

1
browser/installer/package-manifest.in
View file

@ -207,7 +207,6 @@
@RESPATH@/chrome/marionette.manifest
@RESPATH@/components/marionette.manifest
@RESPATH@/components/marionette.js
@RESPATH@/defaults/pref/marionette.js
#endif
#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)

1
mobile/android/installer/package-manifest.in
View file

@ -275,7 +275,6 @@
@BINPATH@/chrome/marionette.manifest
@BINPATH@/components/marionette.manifest
@BINPATH@/components/marionette.js
@BINPATH@/@PREF_DIR@/marionette.js
#endif
#ifdef PKG_LOCALE_MANIFEST

33
modules/libpref/init/all.js
View file

@ -5761,3 +5761,36 @@ pref("services.sync.engine.passwords.validation.maxRecords", 1000);
// a sync.
pref("services.sync.maxResyncs", 5);
#endif // MOZ_SERVICES_SYNC
// Marionette is the remote protocol that lets OOP programs communicate with,
// instrument, and control Gecko.
// Starts and stops the Marionette server.
pref("marionette.enabled", false);
// Delay server startup until a modal dialogue has been clicked to allow time
// for user to set breakpoints in the Browser Toolbox.
pref("marionette.debugging.clicktostart", false);
// Verbosity of Marionette logger repository.
//
// Available levels are, in descending order of severity, "trace", "debug",
// "config", "info", "warn", "error", and "fatal". The value is treated
// case-insensitively.
pref("marionette.log.level", "Info");
// Certain log messages that are known to be long are truncated. This
// preference causes them to not be truncated.
pref("marionette.log.truncate", true);
// Port to start Marionette server on.
pref("marionette.port", 2828);
// Sets recommended automation preferences when Marionette is started.
pref("marionette.prefs.recommended", true);
// Whether content scripts can be safely reused.
//
// Deprecated and scheduled for removal with
// https://bugzil.la/marionette-window-tracking
pref("marionette.contentListener", false);

1
testing/marionette/moz.build
View file

@ -5,7 +5,6 @@
DIRS += ["components"]
JAR_MANIFESTS += ["jar.mn"]
JS_PREFERENCE_FILES += ["prefs/marionette.js"]
MARIONETTE_UNIT_MANIFESTS += ["harness/marionette_harness/tests/unit/unit-tests.ini"]
XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]

38
testing/marionette/prefs/marionette.js
View file

@ -1,38 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global pref */
// Marionette is the remote protocol that lets OOP programs
// communicate with, instrument, and control Gecko.
// Starts and stops the Marionette server.
pref("marionette.enabled", false);
// Delay server startup until a modal dialogue has been clicked to
// allow time for user to set breakpoints in the Browser Toolbox.
pref("marionette.debugging.clicktostart", false);
// Verbosity of Marionette logger repository.
//
// Available levels are, in descending order of severity,
// "trace", "debug", "config", "info", "warn", "error", and "fatal".
// The value is treated case-insensitively.
pref("marionette.log.level", "Info");
// Certain log messages that are known to be long are truncated.
// This preference causes them to not be truncated.
pref("marionette.log.truncate", true);
// Port to start Marionette server on.
pref("marionette.port", 2828);
// Sets recommended automation preferences when Marionette is started.
pref("marionette.prefs.recommended", true);
// Whether content scripts can be safely reused.
//
// Deprecated and scheduled for removal
// with https://bugzil.la/marionette-window-tracking
pref("marionette.contentListener", false);