Revert browserAction.setIcon implementation for Extension Service workers.

This CL partially reverts I1bc55cd5da2cc106e8d74dba172122d2bf943d31
that added support for setIcon from Extension Service workers. This
is because setIcon doesn't work for svg images.

This CL also disables the relevant tests
(*/BrowserActionApiLazyTest.Update with Service workers.)

Bug: 1049214
Test: browser_tests -f *BrowserActionApiLazyTest*:*NavigatingExtensionPopupBrowserTest*:*BrowserActionApiCanvasTest*
Change-Id: Ie3e755c198477b72d27935a54d934bd86dc79c1a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2042142
Auto-Submit: Istiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739384}

chrome/browser/extensions/api/extension_action/browser_action_apitest.cc

@@ -255,7 +255,8 @@ IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest, Basic) {
   EXPECT_TRUE(catcher.GetNextResult());
 }
 
-IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest, Update) {
+using BrowserActionApiUpdateLazyTest = BrowserActionApiLazyTest;
+IN_PROC_BROWSER_TEST_P(BrowserActionApiUpdateLazyTest, Update) {
   ExtensionTestMessageListener ready_listener("ready", true);
   ASSERT_TRUE(embedded_test_server()->Start());
   const Extension* extension = LoadExtensionWithParamFlags(
@@ -301,6 +302,22 @@ INSTANTIATE_TEST_SUITE_P(ServiceWorkerAndExtensionsMenu,
                          ::testing::Values(kUseServiceWorker |
                                            kUseExtensionsMenuUi));
 
+INSTANTIATE_TEST_SUITE_P(EventPageAndLegacyToolbar,
+                         BrowserActionApiUpdateLazyTest,
+                         ::testing::Values(kNone));
+INSTANTIATE_TEST_SUITE_P(EventPageAndExtensionsMenu,
+                         BrowserActionApiUpdateLazyTest,
+                         ::testing::Values(kUseExtensionsMenuUi));
+// TODO(crbug.com/1015136): Enable these once setIcon works in Service worker
+// extensions. Also, combine this suite with BrowserActionApiLazyTest.
+// INSTANTIATE_TEST_SUITE_P(ServiceWorkerAndLegacyToolbar,
+//                          BrowserActionApiUpdateLazyTest,
+//                          ::testing::Values(kUseServiceWorker));
+// INSTANTIATE_TEST_SUITE_P(ServiceWorkerAndExtensionsMenu,
+//                          BrowserActionApiUpdateLazyTest,
+//                          ::testing::Values(kUseServiceWorker |
+//                                            kUseExtensionsMenuUi));
+
 IN_PROC_BROWSER_TEST_F(BrowserActionApiCanvasTest, DynamicBrowserAction) {
   ASSERT_TRUE(RunExtensionTest("browser_action/no_icon")) << message_;
   const Extension* extension = GetSingleLoadedExtension();

extensions/renderer/resources/set_icon.js

@@ -5,32 +5,22 @@
 var SetIconCommon = requireNative('setIcon').SetIconCommon;
 
 function loadImagePath(path, callback) {
-  let fetchPromise = fetch(path);
-
-  let blobPromise = $Promise.then(fetchPromise, function(response) {
-    if (!response.ok) {
-      throw new $Error.self('Could not load action icon \'' + path + '\'.');
-    }
-    return response.blob();
-  });
-
-  let imagePromise = $Promise.then(blobPromise, function(blob) {
-    return createImageBitmap(blob);
-  });
-
-  let imageDataPromise = $Promise.then(imagePromise, function(image) {
-    var canvas = new OffscreenCanvas(image.width, image.height);
+  var img = new Image();
+  img.onerror = function() {
+    console.error('Could not load action icon \'' + path + '\'.');
+  };
+  img.onload = function() {
+    var canvas = document.createElement('canvas');
+    canvas.width = img.width;
+    canvas.height = img.height
     var canvas_context = canvas.getContext('2d');
     canvas_context.clearRect(0, 0, canvas.width, canvas.height);
-    canvas_context.drawImage(image, 0, 0, canvas.width, canvas.height);
+    canvas_context.drawImage(img, 0, 0, canvas.width, canvas.height);
     var imageData = canvas_context.getImageData(0, 0, canvas.width,
                                                 canvas.height);
     callback(imageData);
-  });
-
-  $Promise.catch(imageDataPromise, function(error) {
-    console.error(error);
-  });
+  };
+  img.src = path;
 }
 
 function smellsLikeImageData(imageData) {