Commit 1857a2a1 authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Simplify AuthenticatedURLFetcher::GetExtraRequestHeader conversion churn

This method is creating a net::HttpRequestHeaders object, serializing
it to a string, and then parsing that string to create a new
net::HttpRequestHeaders object.

CL just returns the net::HttpRequestHeaders object directly.
No expected behavior change.

TESTS=Covered by existing tests.

Bug: None
Change-Id: I356c5987e0dcf60e454efc08f93d25ec75954c11
Reviewed-on: https://chromium-review.googlesource.com/1040705
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555741}
parent e132a7eb
...@@ -146,7 +146,7 @@ class OneGoogleBarFetcherImpl::AuthenticatedURLFetcher { ...@@ -146,7 +146,7 @@ class OneGoogleBarFetcherImpl::AuthenticatedURLFetcher {
void Start(); void Start();
private: private:
std::string GetExtraRequestHeaders() const; net::HttpRequestHeaders GetRequestHeaders() const;
void OnURLLoaderComplete(std::unique_ptr<std::string> response_body); void OnURLLoaderComplete(std::unique_ptr<std::string> response_body);
...@@ -174,9 +174,8 @@ OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::AuthenticatedURLFetcher( ...@@ -174,9 +174,8 @@ OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::AuthenticatedURLFetcher(
#endif #endif
callback_(std::move(callback)) {} callback_(std::move(callback)) {}
std::string net::HttpRequestHeaders
OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::GetExtraRequestHeaders() OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::GetRequestHeaders() const {
const {
net::HttpRequestHeaders headers; net::HttpRequestHeaders headers;
// Note: It's OK to pass SignedIn::kNo if it's unknown, as it does not affect // Note: It's OK to pass SignedIn::kNo if it's unknown, as it does not affect
// transmission of experiments coming from the variations server. // transmission of experiments coming from the variations server.
...@@ -205,7 +204,7 @@ OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::GetExtraRequestHeaders() ...@@ -205,7 +204,7 @@ OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::GetExtraRequestHeaders()
chrome_connected_header_value); chrome_connected_header_value);
} }
#endif #endif
return headers.ToString(); return headers;
} }
void OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::Start() { void OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::Start() {
...@@ -237,7 +236,7 @@ void OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::Start() { ...@@ -237,7 +236,7 @@ void OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::Start() {
auto resource_request = std::make_unique<network::ResourceRequest>(); auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = api_url_; resource_request->url = api_url_;
resource_request->load_flags = net::LOAD_DO_NOT_SEND_AUTH_DATA; resource_request->load_flags = net::LOAD_DO_NOT_SEND_AUTH_DATA;
resource_request->headers.AddHeadersFromString(GetExtraRequestHeaders()); resource_request->headers = GetRequestHeaders();
resource_request->request_initiator = resource_request->request_initiator =
url::Origin::Create(GURL(chrome::kChromeUINewTabURL)); url::Origin::Create(GURL(chrome::kChromeUINewTabURL));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment