[DevTools] Add removeFunction to EventListener protocol object

third_party/WebKit/Source/devtools/front_end/sdk/RuntimeModel.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 792 matching lines @@
         return this._removeFunction;
     },
 
     /**
      * @return {!Promise<undefined>}
      */
     remove: function()
     {
         if (!this._removeFunction)
             return Promise.resolve();
-        return new Promise(promiseConstructor.bind(this));
-
-        /**
-         * @param {function()} success
-         * @this {WebInspector.EventListener}
-         */
-        function promiseConstructor(success)
-        {
-            this._removeFunction.callFunction(callCustomRemove, [
+        return this._removeFunction.callFunctionPromise(callCustomRemove, [
                 WebInspector.RemoteObject.toCallArgument(this._removeFunction),
                 WebInspector.RemoteObject.toCallArgument(this._type),
                 WebInspector.RemoteObject.toCallArgument(this._originalHandler),
                 WebInspector.RemoteObject.toCallArgument(this._useCapture),
                 WebInspector.RemoteObject.toCallArgument(this._passive),
-            ], success);
+            ]).then(() => undefined);
 
-            /**
-             * @param {function(string, function(), boolean, boolean)} func
-             * @param {string} type
-             * @param {function()} listener
-             * @param {boolean} useCapture
-             * @param {boolean} passive
-             */
-            function callCustomRemove(func, type, listener, useCapture, passive)
-            {
-                func.call(null, type, listener, useCapture, passive);
-            }
+        /**
+         * @param {function(string, function(), boolean, boolean)} func
+         * @param {string} type
+         * @param {function()} listener
+         * @param {boolean} useCapture
+         * @param {boolean} passive
+         */
+        function callCustomRemove(func, type, listener, useCapture, passive)
+        {
+            func.call(null, type, listener, useCapture, passive);

[dgozman, 2016/06/01 23:54:05]

Let's use |this| instead of |func|.

[kozy, 2016/06/02 01:04:39]

Done.

         }
     },
 
     /**
      * @return {string}
      */
     listenerType: function()
     {
         return this._listenerType;
     },
 
     /**
      * @param {string} listenerType
      */
     setListenerType: function(listenerType)
     {
         this._listenerType = listenerType;
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }