Backed out changeset 69db9d3db655 (bug 1350887)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 03 Apr 2017 21:40:12 +0200
changeset 399132 02a0f61b5bd1400ed3b796e7c6d806605ef1527b
parent 399131 02838ca872766c63522ede9bebc8d29fb6c8b83e
child 399133 1af464748f4a1874c66efb03d8fc7d4750263d4a
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1350887
milestone55.0a1
backs out69db9d3db655a2bfc4195b5dab9a5b5133b1b1d2
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 69db9d3db655 (bug 1350887)
browser/installer/package-manifest.in
testing/marionette/moz.build
testing/marionette/prefs/marionette.js
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -648,20 +648,16 @@
 @RESPATH@/browser/defaults/permissions
 @RESPATH@/browser/defaults/blocklists
 
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 ; Technically this is an app pref file, but we are keeping it in the original
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
 
-; Remote control protocol prefs
-; defined in ../../testing/marionette/prefs/marionette.js
-@RESPATH@/defaults/pref/marionette.js
-
 ; Services (gre) prefs
 @RESPATH@/defaults/pref/services-sync.js
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine.
 @RESPATH@/res/EditorOverride.css
 @RESPATH@/res/contenteditable.css
 @RESPATH@/res/designmode.css
--- a/testing/marionette/moz.build
+++ b/testing/marionette/moz.build
@@ -1,15 +1,15 @@
 # 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/.
 
 DIRS += ["components"]
 
+JS_PREFERENCE_FILES += ["prefs.js"]
+
 JAR_MANIFESTS += ["jar.mn"]
-JS_PREFERENCE_FILES += ["prefs/marionette.js"]
-
 MARIONETTE_UNIT_MANIFESTS += ["harness/marionette_harness/tests/unit/unit-tests.ini"]
 MARIONETTE_WEBAPI_MANIFESTS += ["harness/marionette_harness/tests/webapi-tests.ini"]
 XPCSHELL_TESTS_MANIFESTS += ["unit.ini"]
 
 with Files("**"):
     BUG_COMPONENT = ("Testing", "Marionette")
--- a/testing/marionette/prefs/marionette.js
+++ b/testing/marionette/prefs/marionette.js
@@ -1,19 +1,12 @@
 /* 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/. */
 
-// Marionette is the remote protocol that lets OOP programs communicate
-// with, instrument, and control Gecko.
-//
-// It is included in Firefox, but not enabled by default unless the
-// --marionette flag is passed or the marionette.enabled preference is
-// set to true.
-
 // Whether or not Marionette is enabled.
 pref("marionette.enabled", false);
 
 // Port to start Marionette server on.
 pref("marionette.port", 2828);
 
 // Forces client connections to come from a loopback device.
 pref("marionette.forcelocal", true);