Changeset 271283 in webkit

Timestamp:

Jan 7, 2021, 7:59:24 PM (6 years ago)

Author:

Kate Cheney

Message:

Error in layout tests: "Passed ITP enabled state (0) does not match TCC setting (1)"
​https://bugs.webkit.org/show_bug.cgi?id=220385
<rdar://problem/70730482>

Reviewed by Darin Adler.

No new tests, this has no behavior change. It will fix excessive
logging when running tests.

We do not need to log a discrepancy between these states
for WebKitTestRunner or TestWebKitAPI because they are sometimes treated
like web browsers but need to turn ITP on/off for specific tests, so
these states will not always match.

• NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(WebKit::activateSessionCleanup):

• Shared/Cocoa/DefaultWebBrowserChecks.h:
• Shared/Cocoa/DefaultWebBrowserChecks.mm:

(WebKit::isRunningTest):
(WebKit::isParentProcessAFullWebBrowser):
(WebKit::isFullWebBrowser):
(WebKit::shouldBeTreatedAsFullBrowser): Deleted.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (1 diff)
• Shared/Cocoa/DefaultWebBrowserChecks.h (modified) (1 diff)
• Shared/Cocoa/DefaultWebBrowserChecks.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-07  Kate Cheney  <katherine_cheney@apple.com>
+
+        Error in layout tests: "Passed ITP enabled state (0) does not match TCC setting (1)"
+        https://bugs.webkit.org/show_bug.cgi?id=220385
+        <rdar://problem/70730482>
+
+        Reviewed by Darin Adler.
+
+        No new tests, this has no behavior change. It will fix excessive
+        logging when running tests.
+
+        We do not need to log a discrepancy between these states
+        for WebKitTestRunner or TestWebKitAPI because they are sometimes treated
+        like web browsers but need to turn ITP on/off for specific tests, so
+        these states will not always match.
+
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (WebKit::activateSessionCleanup):
+        * Shared/Cocoa/DefaultWebBrowserChecks.h:
+        * Shared/Cocoa/DefaultWebBrowserChecks.mm:
+        (WebKit::isRunningTest):
+        (WebKit::isParentProcessAFullWebBrowser):
+        (WebKit::isFullWebBrowser):
+        (WebKit::shouldBeTreatedAsFullBrowser): Deleted.
+
 2021-01-07  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -1198 +1198 @@
     bool passedEnabledState = session.isResourceLoadStatisticsEnabled();
 
-    if (itpEnabled != passedEnabledState)
+    // We do not need to log a discrepancy between states for WebKitTestRunner or TestWebKitAPI.
+    if (itpEnabled != passedEnabledState && !isRunningTest(WebCore::applicationBundleIdentifier()))
         WTFLogAlways("Passed ITP enabled state (%d) does not match TCC setting (%d)\n", passedEnabledState, itpEnabled);
     session.setResourceLoadStatisticsEnabled(passedEnabledState);

trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.h

@@ -38 +38 @@
 bool hasProhibitedUsageStrings();
 Optional<Vector<WebCore::RegistrableDomain>> getAppBoundDomainsTesting(const String&);
-bool shouldBeTreatedAsFullBrowser(const String& bundleID);
+bool isRunningTest(const String& bundleID);
 void determineITPState();
 bool doesAppHaveITPEnabled();

trunk/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.mm

@@ -47 +47 @@
 static bool isFullWebBrowser(const String&);
 
-bool shouldBeTreatedAsFullBrowser(const String& bundleID)
+bool isRunningTest(const String& bundleID)
 {
     return bundleID == "com.apple.WebKit.TestWebKitAPI"_s || bundleID == "com.apple.WebKit.WebKitTestRunner"_s || bundleID == "org.webkit.WebKitTestRunnerApp"_s;
@@ -224 +224 @@
     });
 
-    return fullWebBrowser || shouldBeTreatedAsFullBrowser(WebCore::applicationBundleIdentifier());
+    return fullWebBrowser || isRunningTest(WebCore::applicationBundleIdentifier());
 }
 
@@ -233 +233 @@
     static bool fullWebBrowser = WTF::processHasEntitlement("com.apple.developer.web-browser");
 
-    return fullWebBrowser || shouldBeTreatedAsFullBrowser(bundleIdentifier);
+    return fullWebBrowser || isRunningTest(bundleIdentifier);
 }