From 0208e4adad08380fa11ba00b54fb3e459dad10b6 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Mon, 31 May 2021 18:47:53 -0700 Subject: [PATCH] chore: use HTTP status code constants (#29378) --- shell/browser/net/electron_url_loader_factory.cc | 2 +- shell/browser/net/proxying_url_loader_factory.cc | 3 ++- shell/browser/ui/inspectable_web_contents.cc | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/shell/browser/net/electron_url_loader_factory.cc b/shell/browser/net/electron_url_loader_factory.cc index d180b94d4ed0..e60705660a70 100644 --- a/shell/browser/net/electron_url_loader_factory.cc +++ b/shell/browser/net/electron_url_loader_factory.cc @@ -101,7 +101,7 @@ network::mojom::URLResponseHeadPtr ToResponseHead( return head; } - int status_code = 200; + int status_code = net::HTTP_OK; dict.Get("statusCode", &status_code); head->headers = new net::HttpResponseHeaders(base::StringPrintf( "HTTP/1.1 %d %s", status_code, diff --git a/shell/browser/net/proxying_url_loader_factory.cc b/shell/browser/net/proxying_url_loader_factory.cc index e8897d22e44a..7cec0a96cb94 100644 --- a/shell/browser/net/proxying_url_loader_factory.cc +++ b/shell/browser/net/proxying_url_loader_factory.cc @@ -14,6 +14,7 @@ #include "extensions/browser/extension_navigation_ui_data.h" #include "net/base/completion_repeating_callback.h" #include "net/base/load_flags.h" +#include "net/http/http_status_code.h" #include "net/http/http_util.h" #include "services/metrics/public/cpp/ukm_source_id.h" #include "services/network/public/cpp/features.h" @@ -662,7 +663,7 @@ void ProxyingURLLoaderFactory::InProgressRequest:: header_client_receiver_.reset(); target_loader_.reset(); - constexpr int kInternalRedirectStatusCode = 307; + constexpr int kInternalRedirectStatusCode = net::HTTP_TEMPORARY_REDIRECT; net::RedirectInfo redirect_info; redirect_info.status_code = kInternalRedirectStatusCode; diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc index f39b3bdc8c71..9815012b3ade 100644 --- a/shell/browser/ui/inspectable_web_contents.cc +++ b/shell/browser/ui/inspectable_web_contents.cc @@ -38,6 +38,7 @@ #include "content/public/common/user_agent.h" #include "ipc/ipc_channel.h" #include "net/http/http_response_headers.h" +#include "net/http/http_status_code.h" #include "services/network/public/cpp/simple_url_loader.h" #include "services/network/public/cpp/simple_url_loader_stream_consumer.h" #include "services/network/public/cpp/wrapper_shared_url_loader_factory.h" @@ -289,7 +290,7 @@ class InspectableWebContents::NetworkResourceLoader base::DictionaryValue response; response.SetInteger("statusCode", response_headers_ ? response_headers_->response_code() - : 200); + : net::HTTP_OK); auto headers = std::make_unique(); size_t iterator = 0; @@ -652,7 +653,7 @@ void InspectableWebContents::LoadNetworkResource(DispatchCallback callback, GURL gurl(url); if (!gurl.is_valid()) { base::DictionaryValue response; - response.SetInteger("statusCode", 404); + response.SetInteger("statusCode", net::HTTP_NOT_FOUND); std::move(callback).Run(&response); return; }