Bug 1444579 - Restore placesProvider as a member of NewTabUtils r?Gijs
MozReview-Commit-ID: E4WoC7M27KZ
--- a/toolkit/components/extensions/test/xpcshell/test_ext_topSites.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_topSites.js
@@ -39,16 +39,20 @@ add_task(async function test_topSites()
done(data);
});
let provider2 = new TestProvider(done => {
let data = [{url: "http://example1.com/", title: "site#1", frecency: 7, lastVisitDate: now},
{url: "http://example2.com/", title: "site#2", frecency: 6, lastVisitDate: now}];
done(data);
});
+ Assert.ok("activityStreamProvider" in NewTabUtils);
+ Assert.ok("placesProvider" in NewTabUtils);
+ Assert.ok(!("fakeProvider" in NewTabUtils));
+
NewTabUtils.initWithoutProviders();
NewTabUtils.links.addProvider(provider1);
NewTabUtils.links.addProvider(provider2);
NewTabUtils.test1Provider = provider1;
NewTabUtils.test2Provider = provider2;
// Test that results from all providers are returned by default.
let extension = ExtensionTestUtils.loadExtension({
--- a/toolkit/modules/NewTabUtils.jsm
+++ b/toolkit/modules/NewTabUtils.jsm
@@ -2134,10 +2134,11 @@ var NewTabUtils = {
Links.populateCache(aCallback, true);
},
links: Links,
allPages: AllPages,
pinnedLinks: PinnedLinks,
blockedLinks: BlockedLinks,
activityStreamLinks: ActivityStreamLinks,
- activityStreamProvider: ActivityStreamProvider
+ activityStreamProvider: ActivityStreamProvider,
+ placesProvider: PlacesProvider
};