Cleanup: make ExtensionRequestSender manage its IPC responses directly, rather

chrome/renderer/resources/extensions/send_request.js

 // Copyright (c) 2012 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.
 
 var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
 var lastError = require('lastError');
 var natives = requireNative('sendRequest');
 var validate = require('schemaUtils').validate;
 
 // Callback handling.
@@ skipping 96 matching lines @@
 
   // TODO(asargent) - convert all optional native functions to accept raw
   // v8 values instead of expecting JSON strings.
   var doStringify = false;
   if (opt_args.nativeFunction && !opt_args.noStringify)
     doStringify = true;
   var requestArgs = doStringify ?
       chromeHidden.JSON.stringify(request.args) : request.args;
   var nativeFunction = opt_args.nativeFunction || natives.StartRequest;
 
-  var requestId = natives.GetNextRequestId();
-  request.id = requestId;
-  requests[requestId] = request;
-  var hasCallback =
-      (request.callback || opt_args.customCallback) ? true : false;
-  return nativeFunction(functionName, requestArgs, requestId, hasCallback,
-                        opt_args.forIOThread);
+  var hasCallback = !!(request.callback || opt_args.customCallback);
+  var requestId = nativeFunction(functionName,
+                                 requestArgs,
+                                 hasCallback,
+                                 opt_args.forIOThread);
+  if (typeof(requestId) == 'number' && requestId >= 0) {
+    request.id = requestId;
+    requests[requestId] = request;
+  }
 }
 
 exports.sendRequest = sendRequest;