Bug 1444579 - Restore placesProvider as a member of NewTabUtils r?Gijs draft
authorGeoff Lankow <geoff@darktrojan.net>
Thu, 15 Mar 2018 12:19:27 +1300
changeset 767742 d5e7cf1ec06d465d323a3e5366a4ff9917bb1f9b
parent 767726 0d81c80876dd09536f78d1158e1e6ff78f9ad226
push id102679
push userbmo:geoff@darktrojan.net
push dateWed, 14 Mar 2018 23:19:51 +0000
reviewersGijs
bugs1444579
milestone61.0a1
Bug 1444579 - Restore placesProvider as a member of NewTabUtils r?Gijs MozReview-Commit-ID: E4WoC7M27KZ
toolkit/components/extensions/test/xpcshell/test_ext_topSites.js
toolkit/modules/NewTabUtils.jsm
--- 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
 };