mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-22 17:55:50 +00:00
f582d96b98
This is straightforward, with only two notable things. - `#include "nsXPIDLString.h" is replaced with `#include "nsString.h"` throughout, because all nsXPIDLString.h did was include nsString.h. The exception is for files which already include nsString.h, in which case the patch just removes the nsXPIDLString.h inclusion. - The patch removes the |xpidl_string| gtest, but improves the |voided| test to cover some of its ground, e.g. testing Adopt(nullptr). --HG-- extra : rebase_source : 452cc4a08046a1adb1a8099a7e85a1917de5add8
38 lines
1.1 KiB
C++
38 lines
1.1 KiB
C++
/* 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/. */
|
|
|
|
#include "mozilla/ModuleUtils.h"
|
|
#include "nsIServiceManager.h"
|
|
#include "nsContentBlocker.h"
|
|
#include "nsString.h"
|
|
|
|
// Define the constructor function for the objects
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsContentBlocker, Init)
|
|
|
|
NS_DEFINE_NAMED_CID(NS_CONTENTBLOCKER_CID);
|
|
|
|
static const mozilla::Module::CIDEntry kPermissionsCIDs[] = {
|
|
{ &kNS_CONTENTBLOCKER_CID, false, nullptr, nsContentBlockerConstructor },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module::ContractIDEntry kPermissionsContracts[] = {
|
|
{ NS_CONTENTBLOCKER_CONTRACTID, &kNS_CONTENTBLOCKER_CID },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module::CategoryEntry kPermissionsCategories[] = {
|
|
{ "content-policy", NS_CONTENTBLOCKER_CONTRACTID, NS_CONTENTBLOCKER_CONTRACTID },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module kPermissionsModule = {
|
|
mozilla::Module::kVersion,
|
|
kPermissionsCIDs,
|
|
kPermissionsContracts,
|
|
kPermissionsCategories
|
|
};
|
|
|
|
NSMODULE_DEFN(nsPermissionsModule) = &kPermissionsModule;
|