eliminating uses of deprecated nsComponentManager:: methods (bug 267040), r=bsmedberg (189ba5e5) · Commits · The Tor Project / Applications / Mullvad Browser

browser/components/bookmarks/src/nsBookmarksService.cpp

+3 −13

Original line number	Diff line number	Diff line
		@@ -949,11 +949,7 @@ BookmarkParser::Parse(nsIRDFResource aContainer, nsIRDFResource aNodeType)
		// XXX this needs to handle quotes, etc. it'd be nice to use the real parser for this...
		nsresult rv;

		nsCOMPtr<nsIRDFContainer> container;
		rv = nsComponentManager::CreateInstance(kRDFContainerCID,
		nsnull,
		NS_GET_IID(nsIRDFContainer),
		getter_AddRefs(container));
		nsCOMPtr<nsIRDFContainer> container = do_CreateInstance(kRDFContainerCID, &rv);
		if (NS_FAILED(rv)) return rv;

		rv = container->Init(mDataSource, aContainer);
		@@ -2306,10 +2302,7 @@ nsBookmarksService::OnStopRequest(nsIRequest* request, nsISupports *ctxt,
		schedule,
		nsCaseInsensitiveStringComparator()))
		{
		nsCOMPtr<nsISound> soundInterface;
		rv = nsComponentManager::CreateInstance(kSoundCID,
		nsnull, NS_GET_IID(nsISound),
		getter_AddRefs(soundInterface));
		nsCOMPtr<nsISound> soundInterface = do_CreateInstance(kSoundCID, &rv);
		if (NS_SUCCEEDED(rv))
		{
		// for the moment, just beep
		@@ -4940,10 +4933,7 @@ nsBookmarksService::WriteBookmarksContainer(nsIRDFDataSource *ds,
		// rv is used for various functions
		nsresult rv;

		nsCOMPtr<nsIRDFContainer> container;
		rv = nsComponentManager::CreateInstance(kRDFContainerCID, nsnull,
		NS_GET_IID(nsIRDFContainer),
		getter_AddRefs(container));
		nsCOMPtr<nsIRDFContainer> container = do_CreateInstance(kRDFContainerCID, &rv);
		NS_ENSURE_SUCCESS(rv, rv);

		nsCAutoString indentation;

chrome/src/nsChromeRegistry.cpp

+13 −41

Original line number	Diff line number	Diff line
		@@ -1085,10 +1085,7 @@ nsChromeRegistry::LoadDataSource(const nsACString &aFileName,
		}
		}

		nsresult rv = nsComponentManager::CreateInstance(kRDFXMLDataSourceCID,
		nsnull,
		NS_GET_IID(nsIRDFDataSource),
		(void**) aResult);
		nsresult rv = CallCreateInstance(kRDFXMLDataSourceCID, aResult);
		if (NS_FAILED(rv)) return rv;

		// Seed the datasource with the ``chrome'' namespace
		@@ -1468,10 +1465,7 @@ nsChromeRegistry::WriteInfoToDataSource(const char *aDocURI,
		if (NS_FAILED(rv)) return rv;
		if (!container) {
		// Already exists. Create a container instead.
		rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
		nsnull,
		NS_GET_IID(nsIRDFContainer),
		getter_AddRefs(container));
		container = do_CreateInstance("@mozilla.org/rdf/container;1", &rv);
		if (NS_FAILED(rv)) return rv;
		rv = container->Init(dataSource, resource);
		if (NS_FAILED(rv)) return rv;
		@@ -1510,13 +1504,9 @@ nsChromeRegistry::UpdateDynamicDataSource(nsIRDFDataSource *aDataSource,
		PRBool aIsOverlay,
		PRBool aUseProfile, PRBool aRemove)
		{
		nsCOMPtr<nsIRDFContainer> container;
		nsresult rv;

		rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
		nsnull,
		NS_GET_IID(nsIRDFContainer),
		getter_AddRefs(container));
		nsCOMPtr<nsIRDFContainer> container = do_CreateInstance("@mozilla.org/rdf/container;1", &rv);
		if (NS_FAILED(rv)) return rv;

		rv = container->Init(aDataSource, aResource);
		@@ -1624,11 +1614,8 @@ nsChromeRegistry::InstallProvider(const nsACString& aProviderType,
		#endif

		// Load the data source found at the base URL.
		nsCOMPtr<nsIRDFDataSource> dataSource;
		nsresult rv = nsComponentManager::CreateInstance(kRDFXMLDataSourceCID,
		nsnull,
		NS_GET_IID(nsIRDFDataSource),
		(void**) getter_AddRefs(dataSource));
		nsresult rv;
		nsCOMPtr<nsIRDFDataSource> dataSource = do_CreateInstance(kRDFXMLDataSourceCID, &rv);
		if (NS_FAILED(rv)) return rv;

		nsCOMPtr<nsIRDFRemoteDataSource> remote = do_QueryInterface(dataSource, &rv);
		@@ -1773,11 +1760,7 @@ nsChromeRegistry::InstallProvider(const nsACString& aProviderType,
		if (NS_FAILED(rv)) return rv;
		}

		nsCOMPtr<nsIRDFContainer> container;
		rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
		nsnull,
		NS_GET_IID(nsIRDFContainer),
		getter_AddRefs(container));
		nsCOMPtr<nsIRDFContainer> container = do_CreateInstance("@mozilla.org/rdf/container;1", &rv);
		if (NS_FAILED(rv)) return rv;
		rv = container->Init(dataSource, resource);
		if (NS_SUCCEEDED(rv)) {
		@@ -1789,10 +1772,7 @@ nsChromeRegistry::InstallProvider(const nsACString& aProviderType,
		if (NS_FAILED(rv)) return rv;
		if (!installContainer) {
		// Already exists. Create a container instead.
		rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
		nsnull,
		NS_GET_IID(nsIRDFContainer),
		getter_AddRefs(installContainer));
		installContainer = do_CreateInstance("@mozilla.org/rdf/container;1", &rv);
		if (NS_FAILED(rv)) return rv;
		rv = installContainer->Init(installSource, resource);
		if (NS_FAILED(rv)) return rv;
		@@ -2521,11 +2501,8 @@ nsChromeRegistry::GetArcs(nsIRDFDataSource* aDataSource,
		const nsACString& aType,
		nsISimpleEnumerator** aResult)
		{
		nsCOMPtr<nsIRDFContainer> container;
		nsresult rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
		nsnull,
		NS_GET_IID(nsIRDFContainer),
		getter_AddRefs(container));
		nsresult rv;
		nsCOMPtr<nsIRDFContainer> container = do_CreateInstance("@mozilla.org/rdf/container;1", &rv);
		if (NS_FAILED(rv))
		return NS_OK;

		@@ -2556,10 +2533,8 @@ nsChromeRegistry::AddToCompositeDataSource(PRBool aUseProfile)
		{
		nsresult rv = NS_OK;
		if (!mChromeDataSource) {
		rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/datasource;1?name=composite-datasource",
		nsnull,
		NS_GET_IID(nsIRDFCompositeDataSource),
		getter_AddRefs(mChromeDataSource));
		mChromeDataSource = do_CreateInstance(
		"@mozilla.org/rdf/datasource;1?name=composite-datasource", &rv);
		if (NS_FAILED(rv))
		return rv;

		@@ -2933,11 +2908,8 @@ nsChromeRegistry::GetProviderCount(const nsACString& aProviderType, nsIRDFDataSo
		return 0;

		// wrap it in a container
		nsCOMPtr<nsIRDFContainer> container;
		rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
		nsnull,
		NS_GET_IID(nsIRDFContainer),
		getter_AddRefs(container));
		nsCOMPtr<nsIRDFContainer> container =
		do_CreateInstance("@mozilla.org/rdf/container;1", &rv);
		if (NS_FAILED(rv)) return 0;

		rv = container->Init(aDataSource, resource);

docshell/base/nsDocShell.cpp

+2 −8

Original line number	Diff line number	Diff line
		@@ -1429,14 +1429,8 @@ nsDocShell::GetDocumentCharsetInfo(nsIDocumentCharsetInfo **

		// if the mDocumentCharsetInfo does not exist already, we create it now
		if (!mDocumentCharsetInfo) {
		nsresult res =
		nsComponentManager::CreateInstance(kDocumentCharsetInfoCID,
		NULL,
		NS_GET_IID
		(nsIDocumentCharsetInfo),
		getter_AddRefs
		(mDocumentCharsetInfo));
		if (NS_FAILED(res))
		mDocumentCharsetInfo = do_CreateInstance(kDocumentCharsetInfoCID);
		if (!mDocumentCharsetInfo)
		return NS_ERROR_FAILURE;
		}

dom/src/base/nsDOMClassInfo.cpp

+9 −5

Original line number	Diff line number	Diff line
		@@ -1371,7 +1371,11 @@ nsDOMClassInfo::RegisterExternalClasses()
		extern nsScriptNameSpaceManager *gNameSpaceManager;
		NS_ENSURE_TRUE(gNameSpaceManager, NS_ERROR_NOT_INITIALIZED);

		nsresult rv = NS_OK;
		nsresult rv;
		nsCOMPtr<nsIComponentRegistrar> registrar;
		rv = NS_GetComponentRegistrar(getter_AddRefs(registrar));
		NS_ENSURE_SUCCESS(rv, rv);

		nsCOMPtr<nsICategoryManager> cm =
		do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
		NS_ENSURE_SUCCESS(rv, rv);
		@@ -1398,15 +1402,15 @@ nsDOMClassInfo::RegisterExternalClasses()
		getter_Copies(contractId));
		NS_ENSURE_SUCCESS(rv, rv);

		nsCID cid;
		rv = nsComponentManager::ContractIDToClassID(contractId, &cid);

		nsCID *cid;
		rv = registrar->ContractIDToCID(contractId, &cid);
		if (NS_FAILED(rv)) {
		NS_WARNING("Bad contract id registered with the script namespace manager");
		continue;
		}

		rv = gNameSpaceManager->RegisterExternalClassName(categoryEntry.get(), cid);
		rv = gNameSpaceManager->RegisterExternalClassName(categoryEntry.get(), *cid);
		nsMemory::Free(cid);
		NS_ENSURE_SUCCESS(rv, rv);
		}

dom/src/base/nsGlobalWindow.cpp

+2 −11

Original line number	Diff line number	Diff line
		@@ -4360,17 +4360,8 @@ GlobalWindowImpl::GetComputedStyle(nsIDOMElement* aElt,
		nsCOMPtr<nsIComputedDOMStyle> compStyle;

		if (!sComputedDOMStyleFactory) {
		nsCID cid;
		rv = nsComponentManager::
		ContractIDToClassID("@mozilla.org/DOM/Level2/CSS/computedStyleDeclaration;1",
		&cid);

		NS_ENSURE_SUCCESS(rv, rv);

		rv = nsComponentManager::
		GetClassObject(cid, NS_GET_IID(nsIFactory),
		(void **)&sComputedDOMStyleFactory);

		rv = CallGetClassObject("@mozilla.org/DOM/Level2/CSS/computedStyleDeclaration;1",
		&sComputedDOMStyleFactory);
		NS_ENSURE_SUCCESS(rv, rv);
		}