chrome/browser/extensions/api/web_request/web_request_api_unittest.cc - Issue 2264903003: Adjust callers and networking delegates in chrome/ to modified APIs

Unified Diff: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

Issue 2264903003: Adjust callers and networking delegates in chrome/ to modified APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@URLRequestRead

Patch Set: rebased Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/android/offline_pages/offline_page_request_job_unittest.cc ('K') | « chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc ('k') | chrome/browser/extensions/extension_protocols_unittest.cc » ('j') | chrome/browser/predictors/resource_prefetcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

index 294d94d3f16e389c2ff6aab8edcb5671fdf653db..0e6ffd5ceede8125209d98853dce72f467227623 100644

--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

@@ -298,8 +298,7 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceRedirect) {

base::RunLoop().Run();

EXPECT_TRUE(!request->is_pending());

- EXPECT_EQ(net::URLRequestStatus::SUCCESS, request->status().status());

- EXPECT_EQ(0, request->status().error());

+ EXPECT_EQ(net::OK, delegate_.request_status());

EXPECT_EQ(redirect_url, request->url());

EXPECT_EQ(2U, request->url_chain().size());

EXPECT_EQ(0U, ipc_sender_.GetNumTasks());

@@ -349,8 +348,7 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceRedirect) {

base::RunLoop().Run();

EXPECT_TRUE(!request2->is_pending());

- EXPECT_EQ(net::URLRequestStatus::SUCCESS, request2->status().status());

- EXPECT_EQ(0, request2->status().error());

+ EXPECT_EQ(net::OK, delegate_.request_status());

EXPECT_EQ(redirect_url, request2->url());

EXPECT_EQ(2U, request2->url_chain().size());

EXPECT_EQ(0U, ipc_sender_.GetNumTasks());

@@ -418,8 +416,7 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceCancel) {

base::RunLoop().Run();

EXPECT_TRUE(!request->is_pending());

- EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status());

- EXPECT_EQ(net::ERR_BLOCKED_BY_CLIENT, request->status().error());

+ EXPECT_EQ(net::ERR_BLOCKED_BY_CLIENT, delegate_.request_status());

EXPECT_EQ(request_url, request->url());

EXPECT_EQ(1U, request->url_chain().size());

EXPECT_EQ(0U, ipc_sender_.GetNumTasks());

@@ -486,8 +483,7 @@ TEST_F(ExtensionWebRequestTest, SimulateChancelWhileBlocked) {

run_loop.Run();

EXPECT_TRUE(!request->is_pending());

- EXPECT_EQ(net::URLRequestStatus::CANCELED, request->status().status());

- EXPECT_EQ(net::ERR_ABORTED, request->status().error());

+ EXPECT_EQ(net::ERR_ABORTED, delegate_.request_status());

EXPECT_EQ(request_url, request->url());

EXPECT_EQ(1U, request->url_chain().size());

EXPECT_EQ(0U, ipc_sender_.GetNumTasks());

@@ -1120,7 +1116,7 @@ TEST_P(ExtensionWebRequestHeaderModificationTest, TestModifications) {

EXPECT_TRUE(!request->is_pending());

// This cannot succeed as we send the request to a server that does not exist.

- EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status());

+ EXPECT_EQ(net::ERR_FAILED, delegate_.request_status());

EXPECT_EQ(request_url, request->url());

EXPECT_EQ(1U, request->url_chain().size());

EXPECT_EQ(0U, ipc_sender_.GetNumTasks());