[Extensions + Blink] Account for user gesture in v8 function calls

extensions/renderer/user_gestures_native_handler.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/user_gestures_native_handler.h"
 
 #include "base/bind.h"
 #include "extensions/renderer/script_context.h"
 #include "third_party/WebKit/public/web/WebScopedUserGesture.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
@@ skipping 21 matching lines @@
   args.GetReturnValue().Set(v8::Boolean::New(
       args.GetIsolate(),
       blink::WebUserGestureIndicator::isProcessingUserGesture()));
 }
 
 void UserGesturesNativeHandler::RunWithUserGesture(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   blink::WebScopedUserGesture user_gesture(context()->web_frame());
   CHECK_EQ(args.Length(), 1);
   CHECK(args[0]->IsFunction());
-  v8::Local<v8::Value> no_args;
-  context()->CallFunction(v8::Local<v8::Function>::Cast(args[0]), 0, &no_args);
+  context()->CallFunctionSafe(v8::Local<v8::Function>::Cast(args[0]), 0,

[haraken, 2016/10/28 08:45:14]

Where is CallFunctionSafe defined? I couldn't find it in code search.

[Devlin, 2016/10/28 15:00:05]

D'oh - this is supposed to be SafeCallFunction()
(https://cs.chromium.org/chromium/src/extensions/renderer/script_context.h?q=s...)
- I only built webkit_unit_tests here.  Will fix.

The SafeCallFunction() is the version of CallFunction() that uses
requestExecuteV8Function rather than callFunctionEvenIfScriptDisabled, which we
are trying to get rid of.

+                              nullptr);
 }
 
 void UserGesturesNativeHandler::RunWithoutUserGesture(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   blink::WebUserGestureIndicator::consumeUserGesture();
   CHECK_EQ(args.Length(), 1);
   CHECK(args[0]->IsFunction());
   v8::Local<v8::Value> no_args;
-  context()->CallFunction(v8::Local<v8::Function>::Cast(args[0]), 0, &no_args);
+  context()->CallFunctionSafe(v8::Local<v8::Function>::Cast(args[0]), 0,
+                              nullptr);
 }
 
 }  // namespace extensions