Commit f0846cc0 authored by Yeol's avatar Yeol Committed by Commit Bot

Uses SetHeader instead of AddHeadersFromString, for code health.

So it replaced AddHeadersFromString, AddHeaderFromString
with SetHeader in ../chrome.

Bug: 862175
Change-Id: Ifec193eaf09ff75907ed4f0b0c7b29a3a724183b
Reviewed-on: https://chromium-review.googlesource.com/1154852Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Reviewed-by: default avatarPeter Lee <pkl@chromium.org>
Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Reviewed-by: default avatarLuis Hector Chavez <lhchavez@chromium.org>
Reviewed-by: default avatarNathan Parker <nparker@chromium.org>
Commit-Queue: Yeol Park <peary2@gmail.com>
Cr-Commit-Position: refs/heads/master@{#579721}
parent 79516b3d
...@@ -39,8 +39,8 @@ constexpr char kDeviceId[] = "device_id"; ...@@ -39,8 +39,8 @@ constexpr char kDeviceId[] = "device_id";
constexpr char kDeviceType[] = "device_type"; constexpr char kDeviceType[] = "device_type";
constexpr char kDeviceTypeArc[] = "arc_plus_plus"; constexpr char kDeviceTypeArc[] = "arc_plus_plus";
constexpr char kLoginScopedToken[] = "login_scoped_token"; constexpr char kLoginScopedToken[] = "login_scoped_token";
constexpr char kGetAuthCodeHeaders[] = constexpr char kGetAuthCodeKey[] = "Content-Type";
"Content-Type: application/json; charset=utf-8"; constexpr char kGetAuthCodeValue[] = "application/json; charset=utf-8";
constexpr char kContentTypeJSON[] = "application/json"; constexpr char kContentTypeJSON[] = "application/json";
} // namespace } // namespace
...@@ -131,7 +131,7 @@ void ArcBackgroundAuthCodeFetcher::OnGetTokenSuccess( ...@@ -131,7 +131,7 @@ void ArcBackgroundAuthCodeFetcher::OnGetTokenSuccess(
net::LOAD_DISABLE_CACHE | net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE | net::LOAD_BYPASS_CACHE |
net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES; net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
resource_request->method = "POST"; resource_request->method = "POST";
resource_request->headers.AddHeaderFromString(kGetAuthCodeHeaders); resource_request->headers.SetHeader(kGetAuthCodeKey, kGetAuthCodeValue);
simple_url_loader_ = network::SimpleURLLoader::Create( simple_url_loader_ = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation); std::move(resource_request), traffic_annotation);
simple_url_loader_->AttachStringForUpload(request_string, kContentTypeJSON); simple_url_loader_->AttachStringForUpload(request_string, kContentTypeJSON);
......
...@@ -77,8 +77,9 @@ void FeedbackUploaderChrome::AppendExtraHeadersToUploadRequest( ...@@ -77,8 +77,9 @@ void FeedbackUploaderChrome::AppendExtraHeadersToUploadRequest(
if (access_token_.empty()) if (access_token_.empty())
return; return;
resource_request->headers.AddHeaderFromString( resource_request->headers.SetHeader(
base::StringPrintf("Authorization: Bearer %s", access_token_.c_str())); net::HttpRequestHeaders::kAuthorization,
base::StringPrintf("Bearer %s", access_token_.c_str()));
} }
} // namespace feedback } // namespace feedback
...@@ -44,7 +44,7 @@ using content::BrowserThread; ...@@ -44,7 +44,7 @@ using content::BrowserThread;
namespace { namespace {
// Template for optional authorization header when using an OAuth access token. // Template for optional authorization header when using an OAuth access token.
constexpr char kAuthorizationHeader[] = "Authorization: Bearer %s"; constexpr char kAuthorizationHeader[] = "Bearer %s";
} // namespace } // namespace
...@@ -235,7 +235,8 @@ void ProfileDownloader::FetchImageData() { ...@@ -235,7 +235,8 @@ void ProfileDownloader::FetchImageData() {
resource_request->load_flags = resource_request->load_flags =
net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES; net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
if (!auth_token_.empty()) { if (!auth_token_.empty()) {
resource_request->headers.AddHeadersFromString( resource_request->headers.SetHeader(
net::HttpRequestHeaders::kAuthorization,
base::StringPrintf(kAuthorizationHeader, auth_token_.c_str())); base::StringPrintf(kAuthorizationHeader, auth_token_.c_str()));
} }
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
namespace { namespace {
// Header sent on initial request to start the two phase upload process. // Header sent on initial request to start the two phase upload process.
const char kStartHeader[] = "x-goog-resumable: start"; const char kStartHeaderKey[] = "x-goog-resumable";
const char kStartHeaderValue[] = "start";
// Header returned on initial response with URL to use for the second phase. // Header returned on initial response with URL to use for the second phase.
const char kLocationHeader[] = "Location"; const char kLocationHeader[] = "Location";
...@@ -154,7 +155,7 @@ void TwoPhaseUploaderImpl::UploadMetadata() { ...@@ -154,7 +155,7 @@ void TwoPhaseUploaderImpl::UploadMetadata() {
auto resource_request = std::make_unique<network::ResourceRequest>(); auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = base_url_; resource_request->url = base_url_;
resource_request->method = "POST"; resource_request->method = "POST";
resource_request->headers.AddHeadersFromString(kStartHeader); resource_request->headers.SetHeader(kStartHeaderKey, kStartHeaderValue);
url_loader_ = network::SimpleURLLoader::Create(std::move(resource_request), url_loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
traffic_annotation_); traffic_annotation_);
url_loader_->SetAllowHttpErrorResults(true); url_loader_->SetAllowHttpErrorResults(true);
......
...@@ -201,8 +201,10 @@ void FamilyInfoFetcher::OnGetTokenSuccess( ...@@ -201,8 +201,10 @@ void FamilyInfoFetcher::OnGetTokenSuccess(
resource_request->url = url; resource_request->url = url;
resource_request->load_flags = resource_request->load_flags =
net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES; net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
resource_request->headers.AddHeaderFromString(base::StringPrintf( resource_request->headers.SetHeader(
supervised_users::kAuthorizationHeaderFormat, access_token.c_str())); net::HttpRequestHeaders::kAuthorization,
base::StringPrintf(supervised_users::kAuthorizationHeaderFormat,
access_token.c_str()));
simple_url_loader_ = network::SimpleURLLoader::Create( simple_url_loader_ = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation); std::move(resource_request), traffic_annotation);
simple_url_loader_->SetRetryOptions( simple_url_loader_->SetRetryOptions(
......
...@@ -219,8 +219,10 @@ void PermissionRequestCreatorApiary::OnGetTokenSuccess( ...@@ -219,8 +219,10 @@ void PermissionRequestCreatorApiary::OnGetTokenSuccess(
resource_request->load_flags = resource_request->load_flags =
net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES; net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
resource_request->method = "POST"; resource_request->method = "POST";
resource_request->headers.AddHeaderFromString(base::StringPrintf( resource_request->headers.SetHeader(
supervised_users::kAuthorizationHeaderFormat, access_token.c_str())); net::HttpRequestHeaders::kAuthorization,
base::StringPrintf(supervised_users::kAuthorizationHeaderFormat,
access_token.c_str()));
(*it)->simple_url_loader = network::SimpleURLLoader::Create( (*it)->simple_url_loader = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation); std::move(resource_request), traffic_annotation);
(*it)->simple_url_loader->AttachStringForUpload(body, "application/json"); (*it)->simple_url_loader->AttachStringForUpload(body, "application/json");
......
...@@ -132,8 +132,10 @@ void SafeSearchURLReporter::OnGetTokenSuccess( ...@@ -132,8 +132,10 @@ void SafeSearchURLReporter::OnGetTokenSuccess(
resource_request->load_flags = resource_request->load_flags =
net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES; net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
resource_request->method = "POST"; resource_request->method = "POST";
resource_request->headers.AddHeaderFromString(base::StringPrintf( resource_request->headers.SetHeader(
supervised_users::kAuthorizationHeaderFormat, access_token.c_str())); net::HttpRequestHeaders::kAuthorization,
base::StringPrintf(supervised_users::kAuthorizationHeaderFormat,
access_token.c_str()));
(*it)->simple_url_loader = network::SimpleURLLoader::Create( (*it)->simple_url_loader = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation); std::move(resource_request), traffic_annotation);
......
...@@ -11,7 +11,7 @@ const char kAccountConsistencyMirrorRequired[] = ...@@ -11,7 +11,7 @@ const char kAccountConsistencyMirrorRequired[] =
"AccountConsistencyMirrorRequired"; "AccountConsistencyMirrorRequired";
#endif #endif
const char kApprovedExtensions[] = "ApprovedExtensions"; const char kApprovedExtensions[] = "ApprovedExtensions";
const char kAuthorizationHeaderFormat[] = "Authorization: Bearer %s"; const char kAuthorizationHeaderFormat[] = "Bearer %s";
const char kCameraMicDisabled[] = "CameraMicDisabled"; const char kCameraMicDisabled[] = "CameraMicDisabled";
const char kContentPackDefaultFilteringBehavior[] = const char kContentPackDefaultFilteringBehavior[] =
"ContentPackDefaultFilteringBehavior"; "ContentPackDefaultFilteringBehavior";
......
...@@ -177,11 +177,10 @@ class RequestImpl : public SMSService::Request { ...@@ -177,11 +177,10 @@ class RequestImpl : public SMSService::Request {
resource_request->load_flags = resource_request->load_flags =
net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES; net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
resource_request->method = post_data_ ? "POST" : "GET"; resource_request->method = post_data_ ? "POST" : "GET";
resource_request->headers.AddHeaderFromString("Authorization: Bearer " + resource_request->headers.SetHeader(net::HttpRequestHeaders::kAuthorization,
access_token); "Bearer " + access_token);
resource_request->headers.AddHeaderFromString( resource_request->headers.SetHeader(
"X-Developer-Key: " + "X-Developer-Key", GaiaUrls::GetInstance()->oauth2_chrome_client_id());
GaiaUrls::GetInstance()->oauth2_chrome_client_id());
simple_url_loader_ = network::SimpleURLLoader::Create( simple_url_loader_ = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation); std::move(resource_request), traffic_annotation);
simple_url_loader_->SetRetryOptions(kMaxRetries, simple_url_loader_->SetRetryOptions(kMaxRetries,
......
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