Remove testingMode from WebExtensionContext.

https://webkit.org/b/269735
rdar://problem/123254659

Reviewed by Brian Weinstein.

testingMode was added to WebExtensionController, so it is no longer needed on WebExtensionContext.
Removing it prevents the context and controller from mismathcing.

* Source/WebKit/Shared/Extensions/WebExtensionContextParameters.h:
* Source/WebKit/Shared/Extensions/WebExtensionContextParameters.serialization.in:
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionContext.mm:
(-[_WKWebExtensionContext _inTestingMode]): Deleted.
(-[_WKWebExtensionContext _setTestingMode:]): Deleted.
* Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionContextPrivate.h:
* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm:
(WebKit::WebExtensionContext::setTestingMode): Deleted.
* Source/WebKit/UIProcess/Extensions/WebExtensionContext.cpp:
(WebKit::WebExtensionContext::parameters const):
(WebKit::WebExtensionContext::inTestingMode const):
* Source/WebKit/UIProcess/Extensions/WebExtensionContext.h:
(WebKit::WebExtensionContext::inTestingMode const): Deleted.
* Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPINamespaceCocoa.mm:
* Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPIPermissionsCocoa.mm:
* Source/WebKit/WebProcess/Extensions/Cocoa/WebExtensionContextProxyCocoa.mm:
(WebKit::WebExtensionContextProxy::getOrCreate):
* Source/WebKit/WebProcess/Extensions/WebExtensionContextProxy.cpp:
(WebKit::WebExtensionContextProxy::inTestingMode const):
* Source/WebKit/WebProcess/Extensions/WebExtensionContextProxy.h:
* Tools/TestWebKitAPI/cocoa/WebExtensionUtilities.mm:
(-[TestWebExtensionManager initForExtension:extensionControllerConfiguration:]):

Canonical link: https://commits.webkit.org/275006@main

Source/WebKit/Shared/Extensions/WebExtensionContextParameters.h

@@ -46,7 +46,6 @@ struct WebExtensionContextParameters {
     Ref<API::Data> manifestJSON;
 
     double manifestVersion { 0 };
-    bool testingMode { false };
     bool isSessionStorageAllowedInContentScripts { false };
 
     std::optional<WebCore::PageIdentifier> backgroundPageIdentifier;

Source/WebKit/Shared/Extensions/WebExtensionContextParameters.serialization.in

@@ -32,7 +32,6 @@ struct WebKit::WebExtensionContextParameters {
     Ref<API::Data> manifestJSON;
 
     double manifestVersion;
-    bool testingMode;
     bool isSessionStorageAllowedInContentScripts;
 
     std::optional<WebCore::PageIdentifier> backgroundPageIdentifier;

Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionContext.mm

@@ -792,16 +792,6 @@ - (void)didChangeTabProperties:(_WKWebExtensionTabChangedProperties)properties f
     _webExtensionContext->didChangeTabProperties(toImpl(changedTab, *_webExtensionContext), toImpl(properties));
 }
 
-- (BOOL)_inTestingMode
-{
-    return _webExtensionContext->inTestingMode();
-}
-
-- (void)_setTestingMode:(BOOL)testingMode
-{
-    _webExtensionContext->setTestingMode(testingMode);
-}
-
 - (WKWebView *)_backgroundWebView
 {
     return _webExtensionContext->backgroundWebView();
@@ -1158,15 +1148,6 @@ - (void)didChangeTabProperties:(_WKWebExtensionTabChangedProperties)properties f
 {
 }
 
-- (BOOL)_inTestingMode
-{
-    return NO;
-}
-
-- (void)_setTestingMode:(BOOL)testingMode
-{
-}
-
 - (WKWebView *)_backgroundWebView
 {
     return nil;

Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionContextPrivate.h

@@ -29,12 +29,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface _WKWebExtensionContext ()
 
-/*!
- @abstract Enables extra `browser.test` APIs and unsupported API stubs for testing.
- @discussion Defaults to `YES` in debug builds.
- */
-@property (nonatomic, getter=_inTestingMode, setter=_setTestingMode:) BOOL _testingMode;
-
 /*! @abstract The extension background view used for the extension, or `nil` if the extension does not have background content or it is currently unloaded. */
 @property (nonatomic, nullable, readonly) WKWebView *_backgroundWebView;
 

Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm

@@ -2480,15 +2480,6 @@ static _WKWebExtensionContextError toAPI(WebExtensionContext::Error error)
     tab.setTemporaryPermissionMatchPattern(nullptr);
 }
 
-void WebExtensionContext::setTestingMode(bool testingMode)
-{
-    ASSERT(!isLoaded());
-    if (isLoaded())
-        return;
-
-    m_testingMode = testingMode;
-}
-
 std::optional<WebCore::PageIdentifier> WebExtensionContext::backgroundPageIdentifier() const
 {
     if (!m_backgroundWebView || extension().backgroundContentIsServiceWorker())

Source/WebKit/UIProcess/Extensions/WebExtensionContext.cpp

@@ -30,6 +30,7 @@
 
 #include "WebExtensionContextParameters.h"
 #include "WebExtensionContextProxyMessages.h"
+#include "WebExtensionController.h"
 #include "WebPageProxy.h"
 #include <wtf/HashMap.h>
 #include <wtf/NeverDestroyed.h>
@@ -65,7 +66,6 @@ WebExtensionContextParameters WebExtensionContext::parameters() const
         extension().serializeLocalization(),
         extension().serializeManifest(),
         extension().manifestVersion(),
-        inTestingMode(),
         isSessionStorageAllowedInContentScripts(),
         backgroundPageIdentifier(),
 #if ENABLE(INSPECTOR_EXTENSIONS)
@@ -76,6 +76,11 @@ WebExtensionContextParameters WebExtensionContext::parameters() const
     };
 }
 
+bool WebExtensionContext::inTestingMode() const
+{
+    return m_extensionController && m_extensionController->inTestingMode();
+}
+
 const WebExtensionContext::UserContentControllerProxySet& WebExtensionContext::userContentControllers() const
 {
     ASSERT(isLoaded());

Source/WebKit/UIProcess/Extensions/WebExtensionContext.h

@@ -422,8 +422,7 @@ class WebExtensionContext : public API::ObjectImpl<API::Object::Type::WebExtensi
     bool hasActiveUserGesture(WebExtensionTab&) const;
     void clearUserGesture(WebExtensionTab&);
 
-    bool inTestingMode() const { return m_testingMode; }
-    void setTestingMode(bool);
+    bool inTestingMode() const;
 
     URL backgroundContentURL();
     WKWebView *backgroundWebView() const { return m_backgroundWebView.get(); }
@@ -810,11 +809,6 @@ class WebExtensionContext : public API::ObjectImpl<API::Object::Type::WebExtensi
 
     bool m_requestedOptionalAccessToAllHosts { false };
     bool m_hasAccessInPrivateBrowsing { false };
-#ifdef NDEBUG
-    bool m_testingMode { false };
-#else
-    bool m_testingMode { true };
-#endif
 
     VoidCompletionHandlerVector m_actionsToPerformAfterBackgroundContentLoads;
     EventListenerTypeCountedSet m_backgroundContentEventListeners;

Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPINamespaceCocoa.mm

@@ -28,12 +28,14 @@
 #endif
 
 #import "config.h"
-#import "CocoaHelpers.h"
 #import "WebExtensionAPINamespace.h"
-#import <WebKit/_WKWebExtensionPermission.h>
 
 #if ENABLE(WK_WEB_EXTENSIONS)
 
+#import "CocoaHelpers.h"
+#import "WebExtensionControllerProxy.h"
+#import <WebKit/_WKWebExtensionPermission.h>
+
 namespace WebKit {
 
 bool WebExtensionAPINamespace::isPropertyAllowed(const ASCIILiteral& name, WebPage& page)

Source/WebKit/WebProcess/Extensions/API/Cocoa/WebExtensionAPIPermissionsCocoa.mm

@@ -30,6 +30,8 @@
 #import "config.h"
 #import "WebExtensionAPIPermissions.h"
 
+#if ENABLE(WK_WEB_EXTENSIONS)
+
 #import "CocoaHelpers.h"
 #import "Logging.h"
 #import "MessageSenderInlines.h"
@@ -40,8 +42,6 @@
 #import "WebProcess.h"
 #import <wtf/cocoa/VectorCocoa.h>
 
-#if ENABLE(WK_WEB_EXTENSIONS)
-
 namespace WebKit {
 
 static NSString * const permissionsKey = @"permissions";

Source/WebKit/WebProcess/Extensions/Cocoa/WebExtensionContextProxyCocoa.mm

@@ -80,7 +80,6 @@
         context.m_localization = parseLocalization(parameters.localizationJSON.get(), parameters.baseURL);
         context.m_manifest = parseJSON(parameters.manifestJSON.get());
         context.m_manifestVersion = parameters.manifestVersion;
-        context.m_testingMode = parameters.testingMode;
         context.m_isSessionStorageAllowedInContentScripts = parameters.isSessionStorageAllowedInContentScripts;
 
         if (parameters.backgroundPageIdentifier) {

Source/WebKit/WebProcess/Extensions/WebExtensionContextProxy.cpp

@@ -66,6 +66,11 @@ std::optional<WebExtensionTabIdentifier> WebExtensionContextProxy::tabIdentifier
     return std::nullopt;
 }
 
+bool WebExtensionContextProxy::inTestingMode() const
+{
+    return m_extensionControllerProxy && m_extensionControllerProxy->inTestingMode();
+}
+
 RefPtr<WebPage> WebExtensionContextProxy::backgroundPage() const
 {
     return m_backgroundPage.get();

Source/WebKit/WebProcess/Extensions/WebExtensionContextProxy.h

@@ -85,7 +85,7 @@ class WebExtensionContextProxy final : public RefCounted<WebExtensionContextProx
 
     bool isSessionStorageAllowedInContentScripts() { return m_isSessionStorageAllowedInContentScripts; }
 
-    bool inTestingMode() { return m_testingMode; }
+    bool inTestingMode() const;
 
     WebCore::DOMWrapperWorld& toDOMWrapperWorld(WebExtensionContentWorldType);
 
@@ -215,7 +215,6 @@ class WebExtensionContextProxy final : public RefCounted<WebExtensionContextProx
     RetainPtr<_WKWebExtensionLocalization> m_localization;
     RetainPtr<NSDictionary> m_manifest;
     double m_manifestVersion { 0 };
-    bool m_testingMode { false };
     bool m_isSessionStorageAllowedInContentScripts { false };
     RefPtr<WebCore::DOMWrapperWorld> m_contentScriptWorld;
     WeakFrameSet m_extensionContentFrames;

Tools/TestWebKitAPI/cocoa/WebExtensionUtilities.mm

@@ -63,7 +63,6 @@ - (instancetype)initForExtension:(_WKWebExtension *)extension extensionControlle
     _controller = [[_WKWebExtensionController alloc] initWithConfiguration:configuration ?: _WKWebExtensionControllerConfiguration.nonPersistentConfiguration];
 
     _controller._testingMode = YES;
-    _context._testingMode = YES;
 
     // This should always be self. If you need the delegate, use the controllerDelegate property.
     // Delegate method calls will be forwarded to the controllerDelegate.