fixed feature testing for Edge

lib/browser-polyfill/custom-browser-polyfill.js

@@ -45,15 +45,15 @@
 					if (browserAPI.runtime.lastError) {
 						reject(browserAPI.runtime.lastError);
 					} else {
-						try {
-							if (!FEATURE_TESTS["browserAction.setBadgeText"] || !FEATURE_TESTS["browserAction.setBadgeText"].callbackNotSupported) {
+						if (!FEATURE_TESTS["browserAction.setBadgeText"] || !FEATURE_TESTS["browserAction.setBadgeText"].callbackNotSupported) {
+							try {
 								browserAPI.browserAction.setBadgeText(options, resolve);
-							} else {
+							} catch (error) {
+								FEATURE_TESTS["browserAction.setBadgeText"] = { callbackNotSupported: true };
 								browserAPI.browserAction.setBadgeText(options);
 								resolve();
 							}
-						} catch (error) {
-							FEATURE_TESTS["browserAction.setBadgeText"] = { callbackNotSupported: false };
+						} else {
 							browserAPI.browserAction.setBadgeText(options);
 							resolve();
 						}
@@ -63,15 +63,15 @@
 					if (browserAPI.runtime.lastError) {
 						reject(browserAPI.runtime.lastError);
 					} else {
-						try {
-							if (!FEATURE_TESTS["browserAction.setBadgeBackgroundColor"] || !FEATURE_TESTS["browserAction.setBadgeBackgroundColor"].callbackNotSupported) {
+						if (!FEATURE_TESTS["browserAction.setBadgeBackgroundColor"] || !FEATURE_TESTS["browserAction.setBadgeBackgroundColor"].callbackNotSupported) {
+							try {
 								browserAPI.browserAction.setBadgeBackgroundColor(options, resolve);
-							} else {
+							} catch (error) {
+								FEATURE_TESTS["browserAction.setBadgeBackgroundColor"] = { callbackNotSupported: true };
 								browserAPI.browserAction.setBadgeBackgroundColor(options);
 								resolve();
 							}
-						} catch (error) {
-							FEATURE_TESTS["browserAction.setBadgeBackgroundColor"] = { callbackNotSupported: false };
+						} else {
 							browserAPI.browserAction.setBadgeBackgroundColor(options);
 							resolve();
 						}
@@ -81,33 +81,34 @@
 					if (browserAPI.runtime.lastError) {
 						reject(browserAPI.runtime.lastError);
 					} else {
-						try {
-							if (!FEATURE_TESTS["browserAction.setTitle"] || !FEATURE_TESTS["browserAction.setTitle"].callbackNotSupported) {
+						if (!FEATURE_TESTS["browserAction.setTitle"] || !FEATURE_TESTS["browserAction.setTitle"].callbackNotSupported) {
+							try {
 								browserAPI.browserAction.setTitle(options, resolve);
-							} else {
+							} catch (error) {
+								FEATURE_TESTS["browserAction.setTitle"] = { callbackNotSupported: true };
 								browserAPI.browserAction.setTitle(options);
 								resolve();
 							}
-						} catch (error) {
-							FEATURE_TESTS["browserAction.setTitle"] = { callbackNotSupported: false };
+						} else {
 							browserAPI.browserAction.setTitle(options);
 							resolve();
 						}
+
 					}
 				}),
 				setIcon: options => new Promise((resolve, reject) => {
 					if (browserAPI.runtime.lastError) {
 						reject(browserAPI.runtime.lastError);
 					} else {
-						try {
-							if (!FEATURE_TESTS["browserAction.setIcon"] || !FEATURE_TESTS["browserAction.setIcon"].callbackNotSupported) {
+						if (!FEATURE_TESTS["browserAction.setIcon"] || !FEATURE_TESTS["browserAction.setIcon"].callbackNotSupported) {
+							try {
 								browserAPI.browserAction.setIcon(options, resolve);
-							} else {
+							} catch (error) {
+								FEATURE_TESTS["browserAction.setIcon"] = { callbackNotSupported: true };
 								browserAPI.browserAction.setIcon(options);
 								resolve();
 							}
-						} catch (error) {
-							FEATURE_TESTS["browserAction.setIcon"] = { callbackNotSupported: false };
+						} else {
 							browserAPI.browserAction.setIcon(options);
 							resolve();
 						}