[BFCache] Rename WebSchedulerTrackedFeature::kIsolatedWorldScript

Rename WebSchedulerTrackedFeature::kIsolatedWorldScript to
WebSchedulerTrackedFeature::kInjectedJavascript. The injected script
may not (now) run in an isolated world, so this naming is more accurate.
This is a pure rename, and doesn't change the mechanics of any callsites
or orderings in the metrics, so should be safe.

Follow-up from the discussion at
https://chromium-review.googlesource.com/c/chromium/src/+/3116784/3..6/third_party/blink/renderer/core/frame/web_local_frame_impl.cc#b1041

Bug: None
Change-Id: Ibf80d108aa6212470553a0a9d4065439e7e7db96
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3140501
Reviewed-by: Kouhei Ueno <[email protected]>
Reviewed-by: Dave Tapuska <[email protected]>
Owners-Override: Dave Tapuska <[email protected]>
Commit-Queue: Devlin <[email protected]>
Cr-Commit-Position: refs/heads/main@{#918850}

Author: rdcronin

chrome/browser/extensions/back_forward_cache_browsertest.cc

@@ -859,7 +859,7 @@ IN_PROC_BROWSER_TEST_F(
       1,
       histogram_tester_.GetBucketCount(
           "BackForwardCache.HistoryNavigationOutcome.BlocklistedFeature",
-          blink::scheduler::WebSchedulerTrackedFeature::kIsolatedWorldScript));
+          blink::scheduler::WebSchedulerTrackedFeature::kInjectedJavascript));
 }
 // Tests sending a message to all frames does not send it to back-forward
 // cached frames.

content/browser/devtools/protocol/page_handler.cc

@@ -1519,8 +1519,8 @@ Page::BackForwardCacheNotRestoredReason BlocklistedFeatureToProtocol(
     case WebSchedulerTrackedFeature::kOutstandingNetworkRequestDirectSocket:
       return Page::BackForwardCacheNotRestoredReasonEnum::
           OutstandingNetworkRequestDirectSocket;
-    case WebSchedulerTrackedFeature::kIsolatedWorldScript:
-      return Page::BackForwardCacheNotRestoredReasonEnum::IsolatedWorldScript;
+    case WebSchedulerTrackedFeature::kInjectedJavascript:
+      return Page::BackForwardCacheNotRestoredReasonEnum::InjectedJavascript;
     case WebSchedulerTrackedFeature::kInjectedStyleSheet:
       return Page::BackForwardCacheNotRestoredReasonEnum::InjectedStyleSheet;
   }
@@ -1734,7 +1734,7 @@ Page::BackForwardCacheNotRestoredReasonType MapBlocklistedFeatureToType(
       return Page::BackForwardCacheNotRestoredReasonTypeEnum::SupportPending;
     case WebSchedulerTrackedFeature::kMainResourceHasCacheControlNoStore:
     case WebSchedulerTrackedFeature::kMainResourceHasCacheControlNoCache:
-    case WebSchedulerTrackedFeature::kIsolatedWorldScript:
+    case WebSchedulerTrackedFeature::kInjectedJavascript:
     case WebSchedulerTrackedFeature::kSubresourceHasCacheControlNoCache:
     case WebSchedulerTrackedFeature::kSubresourceHasCacheControlNoStore:
     case WebSchedulerTrackedFeature::kDocumentLoaded:

content/browser/renderer_host/back_forward_cache_impl.cc

@@ -247,7 +247,7 @@ BlockListedFeatures GetDisallowedFeatures(
   WebSchedulerTrackedFeatures result = kAlwaysDisallowedFeatures;
 
   if (!IsContentInjectionSupported()) {
-    result.Put(WebSchedulerTrackedFeature::kIsolatedWorldScript);
+    result.Put(WebSchedulerTrackedFeature::kInjectedJavascript);
     result.Put(WebSchedulerTrackedFeature::kInjectedStyleSheet);
   }
 

third_party/blink/common/scheduler/web_scheduler_tracked_feature.cc

@@ -116,8 +116,8 @@ FeatureNames FeatureToNames(WebSchedulerTrackedFeature feature) {
     case WebSchedulerTrackedFeature::kOutstandingNetworkRequestDirectSocket:
       return {"OutstandingNetworkRequestDirectSocket",
               "outstanding network request (direct socket)"};
-    case WebSchedulerTrackedFeature::kIsolatedWorldScript:
-      return {"IsolatedWorldScript", "Isolated world ran script"};
+    case WebSchedulerTrackedFeature::kInjectedJavascript:
+      return {"InjectedJavascript", "External javascript injected"};
     case WebSchedulerTrackedFeature::kInjectedStyleSheet:
       return {"InjectedStyleSheet", "External systesheet injected"};
   }
@@ -188,7 +188,7 @@ WebSchedulerTrackedFeatures StickyFeatures() {
       WebSchedulerTrackedFeature::kPaymentManager,
       WebSchedulerTrackedFeature::kKeyboardLock,
       WebSchedulerTrackedFeature::kWebOTPService,
-      WebSchedulerTrackedFeature::kIsolatedWorldScript,
+      WebSchedulerTrackedFeature::kInjectedJavascript,
       WebSchedulerTrackedFeature::kInjectedStyleSheet);
   return features;
 }

third_party/blink/public/common/scheduler/web_scheduler_tracked_feature.h

@@ -104,7 +104,7 @@ enum class WebSchedulerTrackedFeature : uint32_t {
   kKeyboardLock = 51,
   kWebOTPService = 52,
   kOutstandingNetworkRequestDirectSocket = 53,
-  kIsolatedWorldScript = 54,
+  kInjectedJavascript = 54,
   kInjectedStyleSheet = 55,
   // kMediaSessionImplOnServiceCreated = 56, Removed after implementing
   // MediaSessionImplOnServiceCreated support in back/forward cache.

third_party/blink/public/devtools_protocol/browser_protocol.pdl

@@ -7923,7 +7923,7 @@ domain Page
       KeyboardLock
       WebOTPService
       OutstandingNetworkRequestDirectSocket
-      IsolatedWorldScript
+      InjectedJavascript
       InjectedStyleSheet
       # Disabled for render frame host reasons
       ContentSecurityHandler

third_party/blink/renderer/core/frame/web_local_frame_impl.cc

@@ -863,7 +863,7 @@ void WebLocalFrameImpl::ExecuteScriptInIsolatedWorld(
 
   if (back_forward_cache_aware == BackForwardCacheAware::kPossiblyDisallow) {
     GetFrame()->GetFrameScheduler()->RegisterStickyFeature(
-        SchedulingPolicy::Feature::kIsolatedWorldScript,
+        SchedulingPolicy::Feature::kInjectedJavascript,
         {SchedulingPolicy::DisableBackForwardCache()});
   }
 
@@ -887,7 +887,7 @@ WebLocalFrameImpl::ExecuteScriptInIsolatedWorldAndReturnValue(
 
   if (back_forward_cache_aware == BackForwardCacheAware::kPossiblyDisallow) {
     GetFrame()->GetFrameScheduler()->RegisterStickyFeature(
-        SchedulingPolicy::Feature::kIsolatedWorldScript,
+        SchedulingPolicy::Feature::kInjectedJavascript,
         {SchedulingPolicy::DisableBackForwardCache()});
   }
 
@@ -1034,12 +1034,8 @@ void WebLocalFrameImpl::RequestExecuteScriptImpl(
   DCHECK(GetFrame());
 
   if (back_forward_cache_aware == BackForwardCacheAware::kPossiblyDisallow) {
-    // TODO(devlin): This isn't necessarily an "isolated world" script, but the
-    // purpose is always the same when it comes to BFCache: this was a script
-    // injected by the embedder that isn't strictly a part of the page. Should
-    // these be separate features, or should kIsolatedWorldScript be renamed?
     GetFrame()->GetFrameScheduler()->RegisterStickyFeature(
-        SchedulingPolicy::Feature::kIsolatedWorldScript,
+        SchedulingPolicy::Feature::kInjectedJavascript,
         {SchedulingPolicy::DisableBackForwardCache()});
   }
 

tools/metrics/histograms/enums.xml

@@ -87986,7 +87986,7 @@ Called by update_scheduler_enums.py.-->
   <int value="51" label="KeyboardLock"/>
   <int value="52" label="WebOTPService"/>
   <int value="53" label="OutstandingNetworkRequestDirectSocket"/>
-  <int value="54" label="IsolatedWorldScript"/>
+  <int value="54" label="InjectedJavascript"/>
   <int value="55" label="InjectedStyleSheet"/>
   <int value="56" label="MediaSessionImplOnServiceCreated"/>
 </enum>