Backed out changeset d38cce801fec (bug 1597888) for causing multiple build bustages.

DONTBUILD
CLOSED TREE

--HG--
extra : amend_source : b73a9652b78866e1131288fe4870b5a003071a9d

browser/components/newtab/data/content/tippytop/top_sites.json

@@ -41,12 +41,6 @@
     "image_url": "images/bing-com@2x.png",
     "favicon_url": "favicons/bing-com.ico"
   },
-  {
-    "title": "ctrip",
-    "url": "https://www.ctrip.com/",
-    "image_url": "images/ctrip-com@2x.png",
-    "favicon_url": "favicons/ctrip-com.ico"
-  },
   {
     "title": "duckduckgo",
     "url": "https://www.duckduckgo.com/",
@@ -71,18 +65,6 @@
     "image_url": "images/google-com@2x.png",
     "favicon_url": "favicons/google-com.ico"
   },
-  {
-    "title": "ifeng",
-    "url": "https://www.ifeng.com/",
-    "image_url": "images/ifeng-com@2x.png",
-    "favicon_url": "favicons/ifeng-com.ico"
-  },
-  {
-    "title": "iqiyi",
-    "url": "https://www.iqiyi.com/",
-    "image_url": "images/iqiyi-com@2x.png",
-    "favicon_url": "favicons/iqiyi-com.ico"
-  },
   {
     "title": "leboncoin",
     "url": "http://www.leboncoin.fr/",
@@ -119,12 +101,6 @@
     "image_url": "images/vk-com@2x.png",
     "favicon_url": "favicons/vk-com.ico"
   },
-  {
-    "title": "weibo",
-    "url": "https://weibo.com/",
-    "image_url": "images/weibo-com@2x.png",
-    "favicon_url": "favicons/weibo-com.ico"
-  },
   {
     "title": "wikipedia",
     "url": "https://www.wikipedia.org/",
@@ -148,11 +124,5 @@
     "url": "https://www.youtube.com/",
     "image_url": "images/youtube-com@2x.png",
     "favicon_url": "favicons/youtube-com.png"
-  },
-  {
-    "title": "zhihu",
-    "url": "https://www.zhihu.com/",
-    "image_url": "images/zhihu-com@2x.png",
-    "favicon_url": "favicons/zhihu-com.ico"
   }
 ]

browser/components/newtab/lib/ActivityStream.jsm

@@ -131,10 +131,6 @@ const DEFAULT_SITES = new Map([
     "FR",
     "https://www.youtube.com/,https://www.facebook.com/,https://www.wikipedia.org/,https://www.amazon.fr/,https://www.leboncoin.fr/,https://twitter.com/",
   ],
-  [
-    "CN",
-    "https://www.baidu.com/,https://www.zhihu.com/,https://www.ifeng.com/,https://weibo.com/,https://www.ctrip.com/,https://www.iqiyi.com/",
-  ],
 ]);
 const GEO_PREF = "browser.search.region";
 const REGION_STORIES_CONFIG =