From f6d673c32a968d85cfdc435cb6a9f3785d8fc194 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Sun, 13 Jun 2021 19:04:36 -0700 Subject: [PATCH] chore: use HTTP method constants (#29650) --- shell/browser/net/electron_url_loader_factory.cc | 4 +++- shell/renderer/electron_renderer_client.cc | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/shell/browser/net/electron_url_loader_factory.cc b/shell/browser/net/electron_url_loader_factory.cc index 21435fdfed18..9ce6d2030a74 100644 --- a/shell/browser/net/electron_url_loader_factory.cc +++ b/shell/browser/net/electron_url_loader_factory.cc @@ -16,6 +16,7 @@ #include "mojo/public/cpp/system/data_pipe_producer.h" #include "mojo/public/cpp/system/string_data_source.h" #include "net/base/filename_util.h" +#include "net/http/http_request_headers.h" #include "net/http/http_status_code.h" #include "net/url_request/redirect_util.h" #include "services/network/public/cpp/url_loader_completion_status.h" @@ -455,7 +456,8 @@ void ElectronURLLoaderFactory::StartLoadingHttp( request->method = original_request.method; base::DictionaryValue upload_data; - if (request->method != "GET" && request->method != "HEAD") + if (request->method != net::HttpRequestHeaders::kGetMethod && + request->method != net::HttpRequestHeaders::kHeadMethod) dict.Get("uploadData", &upload_data); ElectronBrowserContext* browser_context = diff --git a/shell/renderer/electron_renderer_client.cc b/shell/renderer/electron_renderer_client.cc index b37860eedbdd..c26d036ba3b4 100644 --- a/shell/renderer/electron_renderer_client.cc +++ b/shell/renderer/electron_renderer_client.cc @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "content/public/renderer/render_frame.h" #include "electron/buildflags/buildflags.h" +#include "net/http/http_request_headers.h" #include "shell/common/api/electron_bindings.h" #include "shell/common/gin_helper/dictionary.h" #include "shell/common/gin_helper/event_emitter_caller.h" @@ -169,7 +170,7 @@ bool ElectronRendererClient::ShouldFork(blink::WebLocalFrame* frame, // FIXME We only support GET here because http method will be ignored when // the OpenURLFromTab is triggered, which means form posting would not work, // we should solve this by patching Chromium in future. - return http_method == "GET"; + return http_method == net::HttpRequestHeaders::kGetMethod; } void ElectronRendererClient::WorkerScriptReadyForEvaluationOnWorkerThread(