commit 0d94256f8ece8ddbb5f3a5c01b31fa42942ef5e7
author rdevlin.cronin <rdevlin.cronin@chromium.org> Fri Dec 09 15:34:23 2016
committer Commit bot <commit-bot@chromium.org> Fri Dec 09 15:37:04 2016
tree 1d50e4368c55af0560b75335addab739d817616a
parent 176226667ce5adc58e636ebf31049acff46810b2

[Extensions] Convert more callers of CallModuleMethod

ModuleSystem::CallModuleMethod is deprecated (see bug for more info).
Convert some callers to use ModuleSystem::CallModuleMethodSafe.
Some callers need the results from the JS call, so introduce a
callback to the safe versions of CallModuleMethod and CallFunction.

BUG=629431

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

extensions/renderer/module_system.cc

diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc
index 034291c..3cdf194d 100644
--- a/extensions/renderer/module_system.cc
+++ b/extensions/renderer/module_system.cc
@@ -285,15 +285,6 @@
 
 v8::Local<v8::Value> ModuleSystem::CallModuleMethod(
     const std::string& module_name,
-    const std::string& method_name) {
-  v8::EscapableHandleScope handle_scope(GetIsolate());
-  v8::Local<v8::Value> no_args;
-  return handle_scope.Escape(
-      CallModuleMethod(module_name, method_name, 0, &no_args));
-}
-
-v8::Local<v8::Value> ModuleSystem::CallModuleMethod(
-    const std::string& module_name,
     const std::string& method_name,
     int argc,
     v8::Local<v8::Value> argv[]) {
@@ -332,20 +323,32 @@
                                         const std::string& method_name) {
   v8::HandleScope handle_scope(GetIsolate());
   v8::Local<v8::Value> no_args;
-  CallModuleMethodSafe(module_name, method_name, 0, &no_args);
+  CallModuleMethodSafe(module_name, method_name, 0, &no_args,
+                       ScriptInjectionCallback::CompleteCallback());
 }
 
 void ModuleSystem::CallModuleMethodSafe(
     const std::string& module_name,
     const std::string& method_name,
     std::vector<v8::Local<v8::Value>>* args) {
-  CallModuleMethodSafe(module_name, method_name, args->size(), args->data());
+  CallModuleMethodSafe(module_name, method_name, args->size(), args->data(),
+                       ScriptInjectionCallback::CompleteCallback());
 }
 
 void ModuleSystem::CallModuleMethodSafe(const std::string& module_name,
                                         const std::string& method_name,
                                         int argc,
                                         v8::Local<v8::Value> argv[]) {
+  CallModuleMethodSafe(module_name, method_name, argc, argv,
+                       ScriptInjectionCallback::CompleteCallback());
+}
+
+void ModuleSystem::CallModuleMethodSafe(
+    const std::string& module_name,
+    const std::string& method_name,
+    int argc,
+    v8::Local<v8::Value> argv[],
+    const ScriptInjectionCallback::CompleteCallback& callback) {
   TRACE_EVENT2("v8", "v8.callModuleMethodSafe", "module_name", module_name,
                "method_name", method_name);
 
@@ -363,7 +366,7 @@
   {
     v8::TryCatch try_catch(GetIsolate());
     try_catch.SetCaptureMessage(true);
-    context_->SafeCallFunction(function, argc, argv);
+    context_->SafeCallFunction(function, argc, argv, callback);
     if (try_catch.HasCaught())
       HandleException(try_catch);
   }