Remove ModuleScriptCreationParams::credentials_mode_

No longer used. Credentials mode is passed instead via
ScriptFetchOptions outside ModuleScriptCreationParams.

Bug: 1152243
Change-Id: Ide2e06ea2c196f3c860d9d66e02ee8d9ba0500a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2612049Reviewed-by: Dominic Farolino <dom@chromium.org>
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841264}

third_party/blink/renderer/core/loader/modulescript/document_module_script_fetcher.cc

@@ -71,8 +71,7 @@ void DocumentModuleScriptFetcher::NotifyFinished(Resource* resource) {
   client_->NotifyFetchFinishedSuccess(ModuleScriptCreationParams(
       /*source_url=*/url, /*base_url=*/url,
       ScriptSourceLocationType::kExternalFile, module_type,
-      script_resource->SourceText(), script_resource->CacheHandler(),
-      script_resource->GetResourceRequest().GetCredentialsMode(), streamer,
+      script_resource->SourceText(), script_resource->CacheHandler(), streamer,
       not_streamed_reason));
 }
 

third_party/blink/renderer/core/loader/modulescript/installed_service_worker_module_script_fetcher.cc

@@ -110,8 +110,7 @@ void InstalledServiceWorkerModuleScriptFetcher::Fetch(
       /*source_url=*/fetch_params.Url(), /*base_url=*/fetch_params.Url(),
       ScriptSourceLocationType::kExternalFile, module_type,
       ParkableString(script_data->TakeSourceText().Impl()),
-      /*cache_handler=*/nullptr,
-      fetch_params.GetResourceRequest().GetCredentialsMode()));
+      /*cache_handler=*/nullptr));
 }
 
 void InstalledServiceWorkerModuleScriptFetcher::Trace(Visitor* visitor) const {

third_party/blink/renderer/core/loader/modulescript/module_script_creation_params.h

@@ -33,7 +33,6 @@ class ModuleScriptCreationParams {
       const ModuleType module_type,
       const ParkableString& source_text,
       SingleCachedMetadataHandler* cache_handler,
-      network::mojom::CredentialsMode credentials_mode,
       ScriptStreamer* script_streamer = nullptr,
       ScriptStreamer::NotStreamingReason not_streaming_reason =
           ScriptStreamer::NotStreamingReason::kStreamingDisabled)
@@ -45,7 +44,6 @@ class ModuleScriptCreationParams {
         source_text_(source_text),
         isolated_source_text_(),
         cache_handler_(cache_handler),
-        credentials_mode_(credentials_mode),
         script_streamer_(script_streamer),
         not_streaming_reason_(not_streaming_reason) {
     DCHECK(source_location_type == ScriptSourceLocationType::kExternalFile ||
@@ -65,9 +63,9 @@ class ModuleScriptCreationParams {
     String isolated_source_text =
         isolated_source_text_ ? isolated_source_text_.IsolatedCopy()
                               : GetSourceText().ToString().IsolatedCopy();
-    return ModuleScriptCreationParams(
-        SourceURL().Copy(), BaseURL().Copy(), source_location_type_,
-        GetModuleType(), isolated_source_text, GetFetchCredentialsMode());
+    return ModuleScriptCreationParams(SourceURL().Copy(), BaseURL().Copy(),
+                                      source_location_type_, GetModuleType(),
+                                      isolated_source_text);
   }
 
   ModuleType GetModuleType() const { return module_type_; }
@@ -91,17 +89,13 @@ class ModuleScriptCreationParams {
   ModuleScriptCreationParams CopyWithClearedSourceText() const {
     return ModuleScriptCreationParams(
         source_url_, base_url_, source_location_type_, module_type_,
-        ParkableString(), /*cache_handler=*/nullptr, credentials_mode_,
+        ParkableString(), /*cache_handler=*/nullptr,
         /*script_streamer=*/nullptr,
         ScriptStreamer::NotStreamingReason::kStreamingDisabled);
   }
 
   SingleCachedMetadataHandler* CacheHandler() const { return cache_handler_; }
 
-  network::mojom::CredentialsMode GetFetchCredentialsMode() const {
-    return credentials_mode_;
-  }
-
   bool IsSafeToSendToAnotherThread() const {
     return source_url_.IsSafeToSendToAnotherThread() &&
            base_url_.IsSafeToSendToAnotherThread() && is_isolated_;
@@ -118,8 +112,7 @@ class ModuleScriptCreationParams {
                              const KURL& base_url,
                              ScriptSourceLocationType source_location_type,
                              const ModuleType& module_type,
-                             const String& isolated_source_text,
-                             network::mojom::CredentialsMode credentials_mode)
+                             const String& isolated_source_text)
       : source_url_(source_url),
         base_url_(base_url),
         source_location_type_(source_location_type),
@@ -127,7 +120,6 @@ class ModuleScriptCreationParams {
         is_isolated_(true),
         source_text_(),
         isolated_source_text_(isolated_source_text),
-        credentials_mode_(credentials_mode),
         // The ScriptStreamer is intentionally cleared since it cannot be passed
         // across threads. This only disables script streaming on worklet
         // top-level scripts where the ModuleScriptCreationParams is
@@ -150,8 +142,6 @@ class ModuleScriptCreationParams {
   // |cache_handler_| is cleared when crossing thread boundaries.
   Persistent<SingleCachedMetadataHandler> cache_handler_;
 
-  const network::mojom::CredentialsMode credentials_mode_;
-
   // |script_streamer_| is cleared when crossing thread boundaries.
   Persistent<ScriptStreamer> script_streamer_;
   const ScriptStreamer::NotStreamingReason not_streaming_reason_;

third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.cc

@@ -102,7 +102,6 @@ void WorkerModuleScriptFetcher::NotifyFinished(Resource* resource) {
   }
 
   NotifyClient(resource->Url(), module_type,
-               script_resource->GetResourceRequest().GetCredentialsMode(),
                script_resource->SourceText(), resource->GetResponse(),
                script_resource->CacheHandler());
 }
@@ -110,7 +109,6 @@ void WorkerModuleScriptFetcher::NotifyFinished(Resource* resource) {
 void WorkerModuleScriptFetcher::NotifyClient(
     const KURL& request_url,
     ModuleType module_type,
-    const network::mojom::CredentialsMode credentials_mode,
     const ParkableString& source_text,
     const ResourceResponse& response,
     SingleCachedMetadataHandler* cache_handler) {
@@ -188,7 +186,7 @@ void WorkerModuleScriptFetcher::NotifyClient(
   client_->NotifyFetchFinishedSuccess(ModuleScriptCreationParams(
       /*source_url=*/url, /*base_url=*/url,
       ScriptSourceLocationType::kExternalFile, module_type, source_text,
-      cache_handler, credentials_mode));
+      cache_handler));
 }
 
 void WorkerModuleScriptFetcher::DidReceiveData(base::span<const char> span) {
@@ -230,7 +228,6 @@ void WorkerModuleScriptFetcher::OnFinishedLoadingWorkerMainScript() {
     source_text_.Append(decoder_->Flush());
   NotifyClient(worker_main_script_loader_->GetRequestURL(),
                ModuleType::kJavaScript,
-               network::mojom::CredentialsMode::kSameOrigin,
                ParkableString(source_text_.ToString().ReleaseImpl()), response,
                worker_main_script_loader_->CreateCachedMetadataHandler());
 }

third_party/blink/renderer/core/loader/modulescript/worker_module_script_fetcher.h

@@ -49,7 +49,6 @@ class CORE_EXPORT WorkerModuleScriptFetcher final
 
   void NotifyClient(const KURL& request_url,
                     ModuleType module_type,
-                    const network::mojom::CredentialsMode credentials_mode,
                     const ParkableString& source_text,
                     const ResourceResponse& response,
                     SingleCachedMetadataHandler* cache_handler);

third_party/blink/renderer/core/loader/modulescript/worklet_module_script_fetcher.cc

@@ -56,8 +56,7 @@ void WorkletModuleScriptFetcher::NotifyFinished(Resource* resource) {
     params.emplace(/*source_url=*/url, /*base_url=*/url,
                    ScriptSourceLocationType::kExternalFile, module_type,
                    script_resource->SourceText(),
-                   script_resource->CacheHandler(),
-                   script_resource->GetResourceRequest().GetCredentialsMode());
+                   script_resource->CacheHandler());
   }
 
   // This will eventually notify |client| passed to

third_party/blink/renderer/core/script/module_map_test.cc

@@ -117,9 +117,8 @@ class ModuleMapTestModulator final : public DummyModulator {
                ModuleGraphLevel,
                ModuleScriptFetcher::Client* client) override {
       CHECK_EQ(request.GetScriptType(), mojom::blink::ScriptType::kModule);
-      TestRequest* test_request = MakeGarbageCollected<TestRequest>(
-          request.Url(), request.GetResourceRequest().GetCredentialsMode(),
-          client);
+      TestRequest* test_request =
+          MakeGarbageCollected<TestRequest>(request.Url(), client);
       modulator_->test_requests_.push_back(test_request);
     }
     String DebugName() const override { return "TestModuleScriptFetcher"; }
@@ -148,21 +147,18 @@ class ModuleMapTestModulator final : public DummyModulator {
   }
 
   struct TestRequest final : public GarbageCollected<TestRequest> {
-    TestRequest(const KURL& url,
-                network::mojom::CredentialsMode credential_mode,
-                ModuleScriptFetcher::Client* client)
-        : url_(url), credential_mode_(credential_mode), client_(client) {}
+    TestRequest(const KURL& url, ModuleScriptFetcher::Client* client)
+        : url_(url), client_(client) {}
     void NotifyFetchFinished() {
       client_->NotifyFetchFinishedSuccess(ModuleScriptCreationParams(
           url_, url_, ScriptSourceLocationType::kExternalFile,
           ModuleType::kJavaScript, ParkableString(String("").ReleaseImpl()),
-          nullptr, credential_mode_));
+          nullptr));
     }
     void Trace(Visitor* visitor) const { visitor->Trace(client_); }
 
    private:
     const KURL url_;
-    const network::mojom::CredentialsMode credential_mode_;
     Member<ModuleScriptFetcher::Client> client_;
   };
   HeapVector<Member<TestRequest>> test_requests_;

third_party/blink/renderer/core/script/module_script_test.cc

@@ -84,8 +84,8 @@ class ModuleScriptTest : public ::testing::Test, public ParametrizedModuleTest {
     ModuleScriptCreationParams params(
         KURL("https://fox.url/script.js"), KURL("https://fox.url/"),
         ScriptSourceLocationType::kInline, ModuleType::kJavaScript,
-        ParkableString(source_text.IsolatedCopy().ReleaseImpl()), cache_handler,
-        network::mojom::CredentialsMode::kOmit);
+        ParkableString(source_text.IsolatedCopy().ReleaseImpl()),
+        cache_handler);
     return JSModuleScript::Create(params, modulator, ScriptFetchOptions());
   }
 

third_party/blink/renderer/core/script/script_loader.cc

@@ -728,7 +728,7 @@ bool ScriptLoader::PrepareScript(const TextPosition& script_start_position,
         ModuleScriptCreationParams params(
             source_url, base_url, ScriptSourceLocationType::kInline,
             ModuleType::kJavaScript, ParkableString(source_text.Impl()),
-            nullptr, options.CredentialsMode());
+            nullptr);
         ModuleScript* module_script =
             JSModuleScript::Create(params, modulator, options, position);
 

third_party/blink/renderer/core/testing/module_test_base.cc

@@ -30,8 +30,7 @@ v8::Local<v8::Module> ModuleTestBase::CompileModule(
   ModuleScriptCreationParams params(
       /*source_url=*/url, /*base_url=*/url,
       ScriptSourceLocationType::kExternalFile, ModuleType::kJavaScript,
-      ParkableString(source.Impl()), nullptr,
-      network::mojom::CredentialsMode::kOmit);
+      ParkableString(source.Impl()), nullptr);
   return ModuleRecord::Compile(isolate, params, ScriptFetchOptions(),
                                TextPosition::MinimumPosition(),
                                exception_state);