[Extensions] Convert more callers of CallModuleMethod

extensions/renderer/script_context.cc

 // Copyright 2014 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 "extensions/renderer/script_context.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_split.h"
@@ skipping 187 matching lines @@
   if (!web_frame_)
     return handle_scope.Escape(function->Call(global, argc, argv));
   return handle_scope.Escape(
       v8::Local<v8::Value>(web_frame_->callFunctionEvenIfScriptDisabled(
           function, global, argc, argv)));
 }
 
 void ScriptContext::SafeCallFunction(const v8::Local<v8::Function>& function,
                                      int argc,
                                      v8::Local<v8::Value> argv[]) {
+  SafeCallFunction(function, argc, argv,
+                   ScriptInjectionCallback::CompleteCallback());
+}
+
+void ScriptContext::SafeCallFunction(
+    const v8::Local<v8::Function>& function,
+    int argc,
+    v8::Local<v8::Value> argv[],
+    const ScriptInjectionCallback::CompleteCallback& callback) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope scope(v8_context());
   v8::MicrotasksScope microtasks(isolate(),
                                  v8::MicrotasksScope::kDoNotRunMicrotasks);
   v8::Local<v8::Object> global = v8_context()->Global();
   if (web_frame_) {
+    ScriptInjectionCallback* wrapper_callback = nullptr;
+    if (!callback.is_null()) {
+      // ScriptInjectionCallback manages its own lifetime.
+      wrapper_callback = new ScriptInjectionCallback(callback);
+    }
     web_frame_->requestExecuteV8Function(v8_context(), function, global, argc,
-                                         argv, nullptr);
+                                         argv, wrapper_callback);
   } else {
     // TODO(devlin): This probably isn't safe.
-    function->Call(global, argc, argv);
+    v8::Local<v8::Value> result = function->Call(global, argc, argv);
+    if (!callback.is_null()) {
+      std::vector<v8::Local<v8::Value>> results(1, result);
+      callback.Run(results);
+    }
   }
 }
 
 Feature::Availability ScriptContext::GetAvailability(
     const std::string& api_name) {
   return GetAvailability(api_name, CheckAliasStatus::ALLOWED);
 }
 
 Feature::Availability ScriptContext::GetAvailability(
     const std::string& api_name,
@@ skipping 290 matching lines @@
     v8::Local<v8::Value> argv[]) {
   return context_->CallFunction(function, argc, argv);
 }
 
 gin::ContextHolder* ScriptContext::Runner::GetContextHolder() {
   v8::HandleScope handle_scope(context_->isolate());
   return gin::PerContextData::From(context_->v8_context())->context_holder();
 }
 
 }  // namespace extensions