Commit 3d593634 authored by Iulian Moraru's avatar Iulian Moraru
Browse files

Backed out changeset 9a295c851c2e (bug 1895232) for causing multiple failures. CLOSED TREE

parent f3a5e131

docshell/build/components.conf

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] == 'android': 
else:

    Classes += [

        {

            'name': 'Mime',

            'cid': '{a7f800e0-4306-11d4-98d0-001083010e9b}',

            'contract_ids': [

                '@mozilla.org/mime;1',

intl/uconv/components.conf

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ Classes = [ 
        'headers': ['/intl/uconv/nsScriptableUConv.h'],

    },

    {

        'name': 'TextToSubURI',

        'js_name': 'textToSubURI',

        'cid': '{8b042e22-6f87-11d3-b3c8-00805f8a6670}',

        'contract_ids': ['@mozilla.org/intl/texttosuburi;1'],

layout/build/components.conf

+0 −2
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ Classes = [ 
        'init_method': 'Init',

    },

    {

        'name': 'ContentSecurityManager',

        'cid': '{cdcc1ab8-3cea-4e6c-a294-a651fa35227f}',

        'contract_ids': ['@mozilla.org/contentsecuritymanager;1'],

        'type': 'nsContentSecurityManager',
@@ -364,7 +363,6 @@ Classes = [ 
        'headers': ['/dom/bindings/nsScriptError.h'],

    },

    {

        'name': 'ScriptSecurityManager',

        'js_name': 'scriptSecurityManager',

        'cid': '{7ee2a4c0-4b93-17d3-ba18-0060b0f199a2}',

        'contract_ids': ['@mozilla.org/scriptsecuritymanager;1'],

netwerk/base/BackgroundFileSaver.cpp

+2 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 


#include "ScopedNSSTypes.h"

#include "mozilla/ArrayAlgorithm.h"

#include "mozilla/Components.h"

#include "mozilla/Casting.h"

#include "mozilla/Logging.h"

#include "mozilla/ScopeExit.h"
@@ -196,7 +195,7 @@ BackgroundFileSaver::EnableSha256() { 
  // Ensure Personal Security Manager is initialized. This is required for

  // PK11_* operations to work.

  nsresult rv;

  mozilla::components::NSSComponent::Service(&rv);

  nsCOMPtr<nsISupports> nssDummy = do_GetService("@mozilla.org/psm;1", &rv);

  NS_ENSURE_SUCCESS(rv, rv);

  MutexAutoLock lock(mLock);

  mSha256Enabled = true;  // this will be read by the worker thread
@@ -221,7 +220,7 @@ BackgroundFileSaver::EnableSignatureInfo() { 
             "Can't enable signature extraction off the main thread");

  // Ensure Personal Security Manager is initialized.

  nsresult rv;

  mozilla::components::NSSComponent::Service(&rv);

  nsCOMPtr<nsISupports> nssDummy = do_GetService("@mozilla.org/psm;1", &rv);

  NS_ENSURE_SUCCESS(rv, rv);

  MutexAutoLock lock(mLock);

  mSignatureInfoEnabled = true;

netwerk/base/Dashboard.cpp

+5 −5
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


#include "mozilla/dom/NetDashboardBinding.h"

#include "mozilla/dom/ToJSValue.h"

#include "mozilla/Components.h"

#include "mozilla/ErrorNames.h"

#include "mozilla/net/Dashboard.h"

#include "mozilla/net/HttpInfo.h"
@@ -822,7 +821,7 @@ Dashboard::RequestDNSInfo(nsINetDashboardCallback* aCallback) { 
  dnsData->mEventTarget = GetCurrentSerialEventTarget();



  if (!mDnsService) {

    mDnsService = mozilla::components::DNS::Service(&rv);

    mDnsService = do_GetService("@mozilla.org/network/dns-service;1", &rv);

    if (NS_FAILED(rv)) {

      return rv;

    }
@@ -932,7 +931,7 @@ Dashboard::RequestDNSLookup(const nsACString& aHost, 
  nsresult rv;



  if (!mDnsService) {

    mDnsService = mozilla::components::DNS::Service(&rv);

    mDnsService = do_GetService("@mozilla.org/network/dns-service;1", &rv);

    if (NS_FAILED(rv)) {

      return rv;

    }
@@ -956,7 +955,7 @@ Dashboard::RequestDNSHTTPSRRLookup(const nsACString& aHost, 
  nsresult rv;



  if (!mDnsService) {

    mDnsService = mozilla::components::DNS::Service(&rv);

    mDnsService = do_GetService("@mozilla.org/network/dns-service;1", &rv);

    if (NS_FAILED(rv)) {

      return rv;

    }
@@ -1151,7 +1150,8 @@ using ErrorEntry = struct { 
};



#undef ERROR

#define ERROR(key, val) {key, #key}

#define ERROR(key, val) \

  { key, #key }



ErrorEntry socketTransportStatuses[] = {

    ERROR(NS_NET_STATUS_RESOLVING_HOST, FAILURE(3)),