Move "create a module script" from ModuleScriptLoader to ModuleScript

Because it will be used from outside ModuleScriptLoader when we support
inline scripts.

This CL
- Renames existing ModuleScript::Create() (which is a simple wrapper of
  the constructor) to CreateForTest(),
- Moves ModuleScriptLoader::CreateModuleScript() to new
  ModuleScript::Create(), and
- Reorders the parameters to match with the spec.

BUG=594639, 715369

Review-Url: https://codereview.chromium.org/2845743003
Cr-Commit-Position: refs/heads/master@{#467873}

third_party/WebKit/Source/core/dom/ModuleMapTest.cpp

@@ -131,7 +131,7 @@ void ModuleMapTestModulator::FetchNewSingleModule(
 
 void ModuleMapTestModulator::ResolveFetches() {
   for (const auto& test_request : test_requests_) {
-    ModuleScript* module_script = ModuleScript::Create(
+    ModuleScript* module_script = ModuleScript::CreateForTest(
         this, ScriptModule(), test_request->url, test_request->nonce,
         kParserInserted, WebURLRequest::kFetchCredentialsModeOmit);
     TaskRunner()->PostTask(

third_party/WebKit/Source/core/dom/ModuleScript.cpp

@@ -10,6 +10,37 @@
 
 namespace blink {
 
+ModuleScript* ModuleScript::Create(
+    const String& source_text,
+    Modulator* modulator,
+    const KURL& base_url,
+    const String& nonce,
+    ParserDisposition parser_state,
+    WebURLRequest::FetchCredentialsMode credentials_mode,
+    AccessControlStatus access_control_status) {
+  // Step 1. Let script be a new module script that this algorithm will
+  // subsequently initialize.
+  // Step 2. Set script's settings object to the environment settings object
+  // provided.
+  // Note: "script's settings object" will be "modulator".
+
+  // Delegate to Modulator::compileModule to process Steps 3-6.
+  ScriptModule result = modulator->CompileModule(
+      source_text, base_url.GetString(), access_control_status);
+  // Step 6: "...return null, and abort these steps."
+  if (result.IsNull())
+    return nullptr;
+  // Step 7. Set script's module record to result.
+  // Step 8. Set script's base URL to the script base URL provided.
+  // Step 9. Set script's cryptographic nonce to the cryptographic nonce
+  // provided.
+  // Step 10. Set script's parser state to the parser state.
+  // Step 11. Set script's credentials mode to the credentials mode provided.
+  // Step 12. Return script.
+  return new ModuleScript(modulator, result, base_url, nonce, parser_state,
+                          credentials_mode);
+}
+
 void ModuleScript::SetInstantiationErrorAndClearRecord(ScriptValue error) {
   // Implements Step 7.1 of:
   // https://html.spec.whatwg.org/multipage/webappapis.html#internal-module-script-graph-fetching-procedure

third_party/WebKit/Source/core/dom/ModuleScript.h

@@ -30,7 +30,16 @@ enum class ModuleInstantiationState {
 // https://html.spec.whatwg.org/multipage/webappapis.html#module-script
 class CORE_EXPORT ModuleScript final : public Script, public TraceWrapperBase {
  public:
-  static ModuleScript* Create(
+  // https://html.spec.whatwg.org/#creating-a-module-script
+  static ModuleScript* Create(const String& source_text,
+                              Modulator*,
+                              const KURL& base_url,
+                              const String& nonce,
+                              ParserDisposition,
+                              WebURLRequest::FetchCredentialsMode,
+                              AccessControlStatus);
+
+  static ModuleScript* CreateForTest(
       Modulator* settings_object,
       ScriptModule record,
       const KURL& base_url,

third_party/WebKit/Source/core/dom/ScriptModuleResolverImplTest.cpp

@@ -61,7 +61,7 @@ ModuleScript* CreateReferrerModuleScript(Modulator* modulator,
       scope.GetIsolate(), "import './target.js'; export const a = 42;",
       "referrer.js", kSharableCrossOrigin);
   KURL referrer_url(kParsedURLString, "https://example.com/referrer.js");
-  ModuleScript* referrer_module_script = ModuleScript::Create(
+  ModuleScript* referrer_module_script = ModuleScript::CreateForTest(
       modulator, referrer_record, referrer_url, "", kParserInserted,
       WebURLRequest::kFetchCredentialsModeOmit);
   // TODO(kouhei): moduleScript->setInstantiateSuccess(); once
@@ -76,8 +76,8 @@ ModuleScript* CreateTargetModuleScript(Modulator* modulator,
                             "target.js", kSharableCrossOrigin);
   KURL url(kParsedURLString, "https://example.com/target.js");
   ModuleScript* module_script =
-      ModuleScript::Create(modulator, record, url, "", kParserInserted,
-                           WebURLRequest::kFetchCredentialsModeOmit);
+      ModuleScript::CreateForTest(modulator, record, url, "", kParserInserted,
+                                  WebURLRequest::kFetchCredentialsModeOmit);
   // TODO(kouhei): moduleScript->setInstantiateSuccess(); once
   // https://codereview.chromium.org/2782403002/ landed.
   return module_script;

third_party/WebKit/Source/core/loader/modulescript/ModuleScriptLoader.cpp

@@ -207,8 +207,8 @@ void ModuleScriptLoader::NotifyFinished(Resource*) {
   // Step 9. Let module script be the result of creating a module script given
   // source text, module map settings object, response's url, cryptographic
   // nonce, parser state, and credentials mode.
-  module_script_ = CreateModuleScript(
-      source_text, GetResource()->GetResponse().Url(), modulator_, nonce_,
+  module_script_ = ModuleScript::Create(
+      source_text, modulator_, GetResource()->GetResponse().Url(), nonce_,
       parser_state_,
       GetResource()->GetResourceRequest().GetFetchCredentialsMode(),
       access_control_status);
@@ -216,38 +216,6 @@ void ModuleScriptLoader::NotifyFinished(Resource*) {
   AdvanceState(State::kFinished);
 }
 
-// https://html.spec.whatwg.org/#creating-a-module-script
-ModuleScript* ModuleScriptLoader::CreateModuleScript(
-    const String& source_text,
-    const KURL& url,
-    Modulator* modulator,
-    const String& nonce,
-    ParserDisposition parser_state,
-    WebURLRequest::FetchCredentialsMode credentials_mode,
-    AccessControlStatus access_control_status) {
-  // Step 1. Let script be a new module script that this algorithm will
-  // subsequently initialize.
-  // Step 2. Set script's settings object to the environment settings object
-  // provided.
-  // Note: "script's settings object" will be "modulator".
-
-  // Delegate to Modulator::compileModule to process Steps 3-6.
-  ScriptModule result = modulator->CompileModule(source_text, url.GetString(),
-                                                 access_control_status);
-  // Step 6: "...return null, and abort these steps."
-  if (result.IsNull())
-    return nullptr;
-  // Step 7. Set script's module record to result.
-  // Step 8. Set script's base URL to the script base URL provided.
-  // Step 9. Set script's cryptographic nonce to the cryptographic nonce
-  // provided.
-  // Step 10. Set script's parser state to the parser state.
-  // Step 11. Set script's credentials mode to the credentials mode provided.
-  // Step 12. Return script.
-  return ModuleScript::Create(modulator, result, url, nonce, parser_state,
-                              credentials_mode);
-}
-
 DEFINE_TRACE(ModuleScriptLoader) {
   visitor->Trace(modulator_);
   visitor->Trace(module_script_);

third_party/WebKit/Source/core/loader/modulescript/ModuleScriptLoader.h

@@ -69,14 +69,6 @@ class CORE_EXPORT ModuleScriptLoader final
                      ModuleScriptLoaderRegistry*,
                      ModuleScriptLoaderClient*);
 
-  static ModuleScript* CreateModuleScript(const String& source_text,
-                                          const KURL&,
-                                          Modulator*,
-                                          const String& nonce,
-                                          ParserDisposition,
-                                          WebURLRequest::FetchCredentialsMode,
-                                          AccessControlStatus);
-
   void AdvanceState(State new_state);
 #if DCHECK_IS_ON()
   static const char* StateToString(State);

third_party/WebKit/Source/core/loader/modulescript/ModuleTreeLinkerTest.cpp

@@ -76,9 +76,9 @@ class ModuleTreeLinkerTestModulator final : public DummyModulator {
     ScriptModule script_module = ScriptModule::Compile(
         script_state_->GetIsolate(), source_text.ToString(), url.GetString(),
         kSharableCrossOrigin);
-    ModuleScript* module_script =
-        ModuleScript::Create(this, script_module, url, "", kParserInserted,
-                             WebURLRequest::kFetchCredentialsModeOmit);
+    ModuleScript* module_script = ModuleScript::CreateForTest(
+        this, script_module, url, "", kParserInserted,
+        WebURLRequest::kFetchCredentialsModeOmit);
     auto result_request = dependency_module_requests_map_.insert(
         script_module, dependency_module_requests);
     EXPECT_TRUE(result_request.is_new_entry);
@@ -121,9 +121,9 @@ class ModuleTreeLinkerTestModulator final : public DummyModulator {
     ScriptModule script_module = ScriptModule::Compile(
         script_state_->GetIsolate(), "export default 'pineapples';",
         url.GetString(), kSharableCrossOrigin);
-    ModuleScript* module_script =
-        ModuleScript::Create(this, script_module, url, "", kParserInserted,
-                             WebURLRequest::kFetchCredentialsModeOmit);
+    ModuleScript* module_script = ModuleScript::CreateForTest(
+        this, script_module, url, "", kParserInserted,
+        WebURLRequest::kFetchCredentialsModeOmit);
     auto result_map = module_map_.insert(url, module_script);
     EXPECT_TRUE(result_map.is_new_entry);