Index: metadata.chrome
===================================================================
--- a/metadata.chrome
+++ b/metadata.chrome
@@ -6,23 +6,25 @@
   <all_urls>
   contextMenus
   webRequest
   webRequestBlocking
   webNavigation
   storage
   unlimitedStorage
   notifications
-backgroundScripts = polyfill.js
+backgroundScripts = base.js
+  polyfill.js
   ext/common.js
   ext/background.js
   lib/compat.js
   lib/publicSuffixList.js
   lib/adblockplus.js
-testScripts = ../polyfill.js
+testScripts = ../base.js
+  ../polyfill.js
   ../ext/common.js
   ../ext/background.js
   ../lib/compat.js
   ../lib/publicSuffixList.js
   tests.js
 options = options.html
 devtools = devtools.html
 browserAction = icons/abp-16.png icons/abp-19.png icons/abp-20.png icons/abp-32.png icons/abp-38.png icons/abp-40.png popup.html
@@ -30,17 +32,21 @@
   icons/detailed/abp-64.png icons/detailed/abp-128.png
 managedStorageSchema = managed-storage-schema.json
 
 [compat]
 chrome = 49.0
 opera = 36.0
 
 [contentScripts]
-document_start = polyfill.js ext/common.js ext/content.js include.preload.js
+document_start = base.js
+  polyfill.js
+  ext/common.js
+  ext/content.js
+  include.preload.js
 document_end = include.postload.js
 
 [mapping]
 subscriptions.xml = adblockpluscore/chrome/content/ui/subscriptions.xml
 firstRun.html = adblockplusui/firstRun.html
 common.js = adblockplusui/common.js
 firstRun.js = adblockplusui/firstRun.js
 i18n.js = adblockplusui/i18n.js