Abstract out Modulator from V8PerContextData

third_party/WebKit/Source/bindings/core/v8/ScriptModule.cpp

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "bindings/core/v8/ScriptModule.h"
 
 #include "bindings/core/v8/V8Binding.h"
 #include "core/dom/Modulator.h"
 #include "core/dom/ScriptModuleResolver.h"
 
@@ skipping 66 matching lines @@
     ret.push_back(toCoreString(v8Name));
   }
   return ret;
 }
 
 v8::MaybeLocal<v8::Module> ScriptModule::resolveModuleCallback(
     v8::Local<v8::Context> context,
     v8::Local<v8::String> specifier,
     v8::Local<v8::Module> referrer) {
   v8::Isolate* isolate = context->GetIsolate();
-  Modulator* modulator = V8PerContextData::from(context)->modulator();
+  Modulator* modulator = Modulator::from(V8PerContextData::from(context));
   DCHECK(modulator);
 
   ScriptModule referrerRecord(isolate, referrer);
   ExceptionState exceptionState(isolate, ExceptionState::ExecutionContext,
                                 "ScriptModule", "resolveModuleCallback");
   ScriptModule resolved = modulator->scriptModuleResolver()->resolve(
       toCoreStringWithNullCheck(specifier), referrerRecord, exceptionState);
   if (resolved.isNull()) {
     DCHECK(exceptionState.hadException());
     return v8::MaybeLocal<v8::Module>();
   }
 
   DCHECK(!exceptionState.hadException());
   return v8::MaybeLocal<v8::Module>(resolved.m_module->newLocal(isolate));
 }
 
 }  // namespace blink