Bug 1478124: Part 8a - Update toolkit module to use a static component manifest. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D15039
This commit is contained in:
Kris Maglione
2018-12-16 16:03:00 -08:00
parent 3b9667706b
commit 3c9b881f84
33 changed files with 305 additions and 479 deletions

View File

@@ -3,6 +3,7 @@
* 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/Components.h"
#include "nsCRT.h"
#include "nsIHttpChannel.h"
#include "nsIObserverService.h"
@@ -14,7 +15,6 @@
#include "nsNetUtil.h"
#include "nsStreamUtils.h"
#include "nsStringStream.h"
#include "nsToolkitCompsCID.h"
#include "nsUrlClassifierStreamUpdater.h"
#include "mozilla/BasePrincipal.h"
#include "mozilla/ErrorNames.h"
@@ -294,7 +294,7 @@ nsUrlClassifierStreamUpdater::DownloadUpdates(
observerService->AddObserver(this, gQuitApplicationMessage, false);
mDBService = do_GetService(NS_URLCLASSIFIERDBSERVICE_CONTRACTID, &rv);
mDBService = mozilla::components::UrlClassifierDB::Service(&rv);
NS_ENSURE_SUCCESS(rv, rv);
mInitialized = true;
@@ -327,7 +327,7 @@ nsUrlClassifierStreamUpdater::DownloadUpdates(
}
nsCOMPtr<nsIUrlClassifierUtils> urlUtil =
do_GetService(NS_URLCLASSIFIERUTILS_CONTRACTID);
mozilla::components::UrlClassifierUtils::Service();
nsTArray<nsCString> tables;
mozilla::safebrowsing::Classifier::SplitTables(aRequestTables, tables);