[Extensions Bindings] Include request id in a custom callback response

extensions/renderer/api_request_handler_unittest.cc

 // Copyright 2016 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/api_request_handler.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "extensions/renderer/api_binding_test.h"
 #include "extensions/renderer/api_binding_test_util.h"
 #include "gin/converter.h"
 #include "gin/function_template.h"
 #include "gin/public/context_holder.h"
 #include "gin/public/isolate_holder.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/WebKit/public/web/WebScopedUserGesture.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
@@ skipping 66 matching lines @@
       ListValueFromString(kArguments);
   ASSERT_TRUE(response_arguments);
   request_handler.CompleteRequest(request_id, *response_arguments,
                                   std::string());
 
   EXPECT_TRUE(did_run_js());
   EXPECT_EQ(ReplaceSingleQuotes(kArguments),
             GetStringPropertyFromObject(context->Global(), context, "result"));
 
   EXPECT_TRUE(request_handler.GetPendingRequestIdsForTesting().empty());
+
+  request_id = request_handler.StartRequest(
+      context, kMethod, base::MakeUnique<base::ListValue>(),
+      v8::Local<v8::Function>(), v8::Local<v8::Function>(),
+      binding::RequestThread::UI);
+  EXPECT_NE(-1, request_id);
+  request_handler.CompleteRequest(request_id, base::ListValue(), std::string());
 }
 
 // Tests that trying to run non-existent or invalided requests is a no-op.
 TEST_F(APIRequestHandlerTest, InvalidRequestsTest) {
   v8::HandleScope handle_scope(isolate());
   v8::Local<v8::Context> context = MainContext();
 
   APIRequestHandler request_handler(
       base::Bind(&DoNothingWithRequest),
       base::Bind(&APIRequestHandlerTest::RunJS, base::Unretained(this)),
@@ skipping 108 matching lines @@
 
   EXPECT_TRUE(did_run_js());
   v8::Local<v8::Value> result =
       GetPropertyFromObject(context->Global(), context, "result");
   ASSERT_FALSE(result.IsEmpty());
   ASSERT_TRUE(result->IsArray());
   ArgumentList args;
   ASSERT_TRUE(gin::Converter<ArgumentList>::FromV8(isolate(), result, &args));
   ASSERT_EQ(5u, args.size());
   EXPECT_EQ("\"method\"", V8ToString(args[0], context));
-  EXPECT_EQ("{}", V8ToString(args[1], context));
+  EXPECT_EQ(base::StringPrintf("{\"id\":%d}", request_id),
+            V8ToString(args[1], context));
   EXPECT_EQ(callback, args[2]);
   EXPECT_EQ("\"response\"", V8ToString(args[3], context));
   EXPECT_EQ("\"arguments\"", V8ToString(args[4], context));
 
   EXPECT_TRUE(request_handler.GetPendingRequestIdsForTesting().empty());
 }
 
 // Test that having a custom callback without an extension-provided callback
 // doesn't crash.
 TEST_F(APIRequestHandlerTest, CustomCallbackArgumentsWithEmptyCallback) {
@@ skipping 20 matching lines @@
 
   EXPECT_TRUE(did_run_js());
   v8::Local<v8::Value> result =
       GetPropertyFromObject(context->Global(), context, "result");
   ASSERT_FALSE(result.IsEmpty());
   ASSERT_TRUE(result->IsArray());
   ArgumentList args;
   ASSERT_TRUE(gin::Converter<ArgumentList>::FromV8(isolate(), result, &args));
   ASSERT_EQ(3u, args.size());
   EXPECT_EQ("\"method\"", V8ToString(args[0], context));
-  EXPECT_EQ("{}", V8ToString(args[1], context));
+  EXPECT_EQ(base::StringPrintf("{\"id\":%d}", request_id),
+            V8ToString(args[1], context));
   EXPECT_TRUE(args[2]->IsUndefined());
 
   EXPECT_TRUE(request_handler.GetPendingRequestIdsForTesting().empty());
 }
 
 // Test user gestures being curried around for API requests.
 TEST_F(APIRequestHandlerTest, UserGestureTest) {
   v8::HandleScope handle_scope(isolate());
   v8::Local<v8::Context> context = MainContext();
 
@@ skipping 153 matching lines @@
         v8::Local<v8::Function>(), binding::RequestThread::UI);
     request_handler.CompleteRequest(request_id, base::ListValue(),
                                     "some error");
     ASSERT_TRUE(logged_error);
     EXPECT_EQ("Unchecked runtime.lastError: some error", *logged_error);
     logged_error.reset();
   }
 }
 
 }  // namespace extensions