Commit 7cd43cc6 authored by Norisz Fay's avatar Norisz Fay
Browse files

Backed out 5 changesets (bug 1766228) for causing lint failures on test_restrequest.js CLOSED TREE 

Backed out changeset 5ff1634cfe18 (bug 1766228)
Backed out changeset 01642c97e7a5 (bug 1766228)
Backed out changeset cbba28151712 (bug 1766228)
Backed out changeset 76a32127865d (bug 1766228)
Backed out changeset 2c7ef1ad380a (bug 1766228)
parent 1be10545

devtools/client/shared/test-helpers/jest-fixtures/Services.js

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
// This fixture is probably doing too much and should be reduced to the minimum

// needed to pass the tests.



/* eslint-disable mozilla/valid-services */



// Some constants from nsIPrefBranch.idl.

const PREF_INVALID = 0;

const PREF_STRING = 32;

docs/code-quality/lint/linters/eslint-plugin-mozilla/valid-services.rst

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
valid-services

==============



Ensures that accesses of the ``Services`` object are valid.



Examples of incorrect code for this rule:

-----------------------------------------



Assuming ``foo`` is not defined within Services.



.. code-block:: js



    Services.foo.fn();



Examples of correct code for this rule:

---------------------------------------



Assuming ``bar`` is defined within Services.



.. code-block:: js



    Services.bar.fn();

docshell/build/components.conf

+0 −2
Original line number Diff line number Diff line
@@ -61,9 +61,7 @@ Classes = [ 
        'js_name': 'uriFixup',

        'cid': '{c6cf88b7-452e-47eb-bdc9-86e3561648ef}',

        'contract_ids': ['@mozilla.org/docshell/uri-fixup;1'],

        'interfaces': ['nsIURIFixup'],

        'jsm': 'resource://gre/modules/URIFixup.jsm',

        'singleton': True,

        'constructor': 'URIFixup',

    },

    {

netwerk/build/components.conf

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ Classes = [ 
            '@mozilla.org/cookieService;1',

            '@mozilla.org/cookiemanager;1',

        ],

        'interfaces': ['nsICookieService', 'nsICookieManager'],

        'interfaces': ['nsICookieManager'],

        'singleton': True,

        'type': 'nsICookieService',

        'constructor': 'mozilla::net::CookieService::GetXPCOMSingleton',

netwerk/cookie/test/unit/test_bug1155169.js

+3 −1
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); 


const URI = Services.io.newURI("http://example.org/");



const cs = Cc["@mozilla.org/cookieService;1"].getService(Ci.nsICookieService);



function run_test() {

  // Allow all cookies.

  Services.prefs.setIntPref("network.cookie.cookieBehavior", 0);
@@ -79,7 +81,7 @@ function setCookie(value, expected) { 
      contentPolicyType: Ci.nsIContentPolicy.TYPE_DOCUMENT,

    });



    Services.cookies.setCookieStringFromHttp(URI, valueInternal, channel);

    cs.setCookieStringFromHttp(URI, valueInternal, channel);

    Services.obs.removeObserver(observer, "cookie-changed");

  }