Use ScopedWorkerBasedExtensionsChannel in some tests where it's needed.

ScopedWorkerBasedExtensionsChannel was introduced recently to centralize
worker's channel requirement for test. However, some tests are still
using manual channel override with ScopedCurrentChannel, this CL updates
them.

This makes moving SWs to different channel in future easier.

Bug: None
Change-Id: Iacc9faa2dbaf3569c0988893c1c542c19800e4f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1869016Reviewed-by: David Bertoni <dbertoni@chromium.org>
Commit-Queue: Istiaque Ahmed <lazyboy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708201}

chrome/browser/extensions/api/context_menus/context_menu_apitest.cc

@@ -19,7 +19,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/test/browser_test_utils.h"
-#include "extensions/common/features/feature_channel.h"
+#include "extensions/common/scoped_worker_based_extensions_channel.h"
 #include "extensions/test/result_catcher.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/base/models/menu_model.h"
@@ -134,8 +134,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContextMenus) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ServiceWorkerContextMenus) {
-  // Service Workers are currently available only in Canary or trunk.
-  ScopedCurrentChannel current_channel_override(version_info::Channel::UNKNOWN);
+  ScopedWorkerBasedExtensionsChannel worker_channel_override;
   ASSERT_TRUE(RunExtensionTestWithFlags("context_menus/event_page",
                                         kFlagRunAsServiceWorkerBasedExtension))
       << message_;

extensions/common/features/simple_feature_unittest.cc

@@ -22,6 +22,7 @@
 #include "extensions/common/features/feature_session_type.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handlers/background_info.h"
+#include "extensions/common/scoped_worker_based_extensions_channel.h"
 #include "extensions/common/switches.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -991,8 +992,7 @@ TEST(SimpleFeatureUnitTest, TestExperimentalExtensionApisSwitch) {
 }
 
 TEST(SimpleFeatureUnitTest, DisallowForServiceWorkers) {
-  // Service Worker features are only available on the trunk.
-  ScopedCurrentChannel current_channel_override(version_info::Channel::UNKNOWN);
+  ScopedWorkerBasedExtensionsChannel worker_channel_override;
 
   SimpleFeature feature;
   feature.set_name("somefeature");