| Index: extensions/renderer/api_request_handler_unittest.cc
|
| diff --git a/extensions/renderer/api_request_handler_unittest.cc b/extensions/renderer/api_request_handler_unittest.cc
|
| index 3bff9eaa9fcbfbc8e15dea8aff2593ae3b279e64..9479b50b32e7a0de4ed42a1e6b5de96a526d2584 100644
|
| --- a/extensions/renderer/api_request_handler_unittest.cc
|
| +++ b/extensions/renderer/api_request_handler_unittest.cc
|
| @@ -54,7 +54,8 @@ TEST_F(APIRequestHandlerTest, AddRequestAndCompleteRequestTest) {
|
| v8::Local<v8::Context> context = ContextLocal();
|
|
|
| APIRequestHandler request_handler(
|
| - base::Bind(&APIRequestHandlerTest::RunJS, base::Unretained(this)));
|
| + base::Bind(&APIRequestHandlerTest::RunJS, base::Unretained(this)),
|
| + APILastError(APILastError::GetParent()));
|
|
|
| EXPECT_TRUE(request_handler.GetPendingRequestIdsForTesting().empty());
|
|
|
| @@ -70,7 +71,8 @@ TEST_F(APIRequestHandlerTest, AddRequestAndCompleteRequestTest) {
|
| std::unique_ptr<base::ListValue> response_arguments =
|
| ListValueFromString(kArguments);
|
| ASSERT_TRUE(response_arguments);
|
| - request_handler.CompleteRequest(request_id, *response_arguments);
|
| + request_handler.CompleteRequest(request_id, *response_arguments,
|
| + std::string());
|
|
|
| EXPECT_TRUE(did_run_js());
|
| EXPECT_EQ(ReplaceSingleQuotes(kArguments),
|
| @@ -85,7 +87,8 @@ TEST_F(APIRequestHandlerTest, InvalidRequestsTest) {
|
| v8::Local<v8::Context> context = ContextLocal();
|
|
|
| APIRequestHandler request_handler(
|
| - base::Bind(&APIRequestHandlerTest::RunJS, base::Unretained(this)));
|
| + base::Bind(&APIRequestHandlerTest::RunJS, base::Unretained(this)),
|
| + APILastError(APILastError::GetParent()));
|
|
|
| v8::Local<v8::Function> function = FunctionFromString(context, kEchoArgs);
|
| ASSERT_FALSE(function.IsEmpty());
|
| @@ -101,12 +104,14 @@ TEST_F(APIRequestHandlerTest, InvalidRequestsTest) {
|
|
|
| // Try running with a non-existent request id.
|
| int fake_request_id = 42;
|
| - request_handler.CompleteRequest(fake_request_id, *response_arguments);
|
| + request_handler.CompleteRequest(fake_request_id, *response_arguments,
|
| + std::string());
|
| EXPECT_FALSE(did_run_js());
|
|
|
| // Try running with a request from an invalidated context.
|
| request_handler.InvalidateContext(context);
|
| - request_handler.CompleteRequest(request_id, *response_arguments);
|
| + request_handler.CompleteRequest(request_id, *response_arguments,
|
| + std::string());
|
| EXPECT_FALSE(did_run_js());
|
| }
|
|
|
| @@ -118,7 +123,8 @@ TEST_F(APIRequestHandlerTest, MultipleRequestsAndContexts) {
|
| holder_b.SetContext(context_b);
|
|
|
| APIRequestHandler request_handler(
|
| - base::Bind(&APIRequestHandlerTest::RunJS, base::Unretained(this)));
|
| + base::Bind(&APIRequestHandlerTest::RunJS, base::Unretained(this)),
|
| + APILastError(APILastError::GetParent()));
|
|
|
| // By having both different arguments and different behaviors in the
|
| // callbacks, we can easily verify that the right function is called in the
|
| @@ -140,7 +146,7 @@ TEST_F(APIRequestHandlerTest, MultipleRequestsAndContexts) {
|
| ListValueFromString("['response_a:']");
|
| ASSERT_TRUE(response_a);
|
|
|
| - request_handler.CompleteRequest(request_a, *response_a);
|
| + request_handler.CompleteRequest(request_a, *response_a, std::string());
|
| EXPECT_TRUE(did_run_js());
|
| EXPECT_THAT(request_handler.GetPendingRequestIdsForTesting(),
|
| testing::UnorderedElementsAre(request_b));
|
| @@ -153,7 +159,7 @@ TEST_F(APIRequestHandlerTest, MultipleRequestsAndContexts) {
|
| ListValueFromString("['response_b:']");
|
| ASSERT_TRUE(response_b);
|
|
|
| - request_handler.CompleteRequest(request_b, *response_b);
|
| + request_handler.CompleteRequest(request_b, *response_b, std::string());
|
| EXPECT_TRUE(request_handler.GetPendingRequestIdsForTesting().empty());
|
|
|
| EXPECT_EQ(
|
| @@ -166,7 +172,8 @@ TEST_F(APIRequestHandlerTest, CustomCallbackArguments) {
|
| v8::Local<v8::Context> context = ContextLocal();
|
|
|
| APIRequestHandler request_handler(
|
| - base::Bind(&APIRequestHandlerTest::RunJS, base::Unretained(this)));
|
| + base::Bind(&APIRequestHandlerTest::RunJS, base::Unretained(this)),
|
| + APILastError(APILastError::GetParent()));
|
|
|
| ArgumentList custom_callback_args = {
|
| gin::StringToV8(isolate(), "to"), gin::StringToV8(isolate(), "be"),
|
| @@ -183,7 +190,8 @@ TEST_F(APIRequestHandlerTest, CustomCallbackArguments) {
|
| std::unique_ptr<base::ListValue> response_arguments =
|
| ListValueFromString("['or','not','to','be']");
|
| ASSERT_TRUE(response_arguments);
|
| - request_handler.CompleteRequest(request_id, *response_arguments);
|
| + request_handler.CompleteRequest(request_id, *response_arguments,
|
| + std::string());
|
|
|
| EXPECT_TRUE(did_run_js());
|
| EXPECT_EQ(ReplaceSingleQuotes("['to','be','or','not','to','be']"),
|
|
|