Skip to content

Commit

Permalink
Revert "Unify allow_credentials and credentials_mode on network::Reso…
Browse files Browse the repository at this point in the history
…urceRequest"

This reverts commit 1ccc5ee.

Reason for revert: causing compile failures on the
linux-chromeos-google-rel builder.

https://ci.chromium.org/p/chrome/builders/ci/linux-chromeos-google-rel/5042



Original change's description:
> Unify allow_credentials and credentials_mode on network::ResourceRequest
> 
> Remove allow_credentials, map allow_credentials: false to
> credentials_mode: kOmit and map allow_credentials: true to
> credentials_mode: kInclude.
> 
> network::URLLoader cannot handle kSameOrigin. This CL doesn't change
> that. CORSURLLoader translates the value to either kOmit or kInclude.
> 
> This works correctly even when OOR-CORS is disabled because in that
> case load flags are set in the renderer. One caveat is we will not
> be able to remove the load flags until we remove the blink-side CORS
> code (M78? M79?) with this change.
> 
> This CL removes a validity check for credentials related settings in
> CorsURLLoaderFactory. Originally the check was introduced to check the
> inconsistency between credentials_mode and load flags. After that
> allow_credentials was introduced, and at
> https://crrev.com/c/chromium/src/+/1443976 the logic was changed to
> check the inconsistency between credentials_mode and allow_credentials.
> Now they are merged and we don't need the check.
> 
> Bug: 799935
> Change-Id: Ic05b2d41456d91fd3f48416a3a3e8fc98e235756
> Tbr: bsimonnet@chromium.org, dimich@chromium.org, groby@chromium.org, markusheintz@chromium.org, olka@chromium.org, satorux@chromium.org, tbansal@chromium.org
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1695341
> Commit-Queue: Yutaka Hirano <yhirano@chromium.org>
> Reviewed-by: Tom Sepez <tsepez@chromium.org>
> Reviewed-by: Greg Levin <glevin@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Reviewed-by: Nicolas Ouellet-Payeur <nicolaso@chromium.org>
> Reviewed-by: Friedrich [CET] <fhorschig@chromium.org>
> Reviewed-by: Marc Treib <treib@chromium.org>
> Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
> Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
> Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
> Reviewed-by: Matt Menke <mmenke@chromium.org>
> Reviewed-by: Kyle Milka <kmilka@chromium.org>
> Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
> Reviewed-by: Mark Pearson <mpearson@chromium.org>
> Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
> Reviewed-by: Emily Stark <estark@chromium.org>
> Reviewed-by: John Rummell <jrummell@chromium.org>
> Reviewed-by: Ganggui Tang <gogerald@chromium.org>
> Reviewed-by: Michael Martis <martis@chromium.org>
> Reviewed-by: Mathias Carlen <mcarlen@chromium.org>
> Reviewed-by: Tsuyoshi Horo <horo@chromium.org>
> Reviewed-by: Patrick Noland <pnoland@chromium.org>
> Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
> Reviewed-by: Matt Reynolds <mattreynolds@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
> Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
> Reviewed-by: Takashi Toyoshima <toyoshim@chromium.org>
> Reviewed-by: David Benjamin <davidben@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#681698}

TBR=sky@chromium.org,horo@chromium.org,mpearson@chromium.org,davidben@chromium.org,thakis@chromium.org,toyoshim@chromium.org,nyquist@chromium.org,markusheintz@chromium.org,vasilii@chromium.org,jrummell@chromium.org,asvitkine@chromium.org,groby@chromium.org,bsimonnet@chromium.org,rsorokin@chromium.org,glevin@chromium.org,yhirano@chromium.org,dimich@chromium.org,mmenke@chromium.org,nhiroki@chromium.org,sdefresne@chromium.org,tsepez@chromium.org,treib@chromium.org,estark@chromium.org,tbansal@chromium.org,gogerald@chromium.org,mattreynolds@chromium.org,wychen@chromium.org,olka@chromium.org,satorux@chromium.org,rbpotter@chromium.org,pnoland@chromium.org,fhorschig@chromium.org,martis@chromium.org,kmilka@chromium.org,jselover@chromium.org,nicolaso@chromium.org,mcarlen@chromium.org

Change-Id: I60b04dc48cd24370db18211d2870fae2f598c9d1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 799935
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1724029
Reviewed-by: Noel Gordon <noel@chromium.org>
Commit-Queue: Noel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681706}
  • Loading branch information
Noel Gordon authored and Commit Bot committed Jul 29, 2019
1 parent 5cfa104 commit ae8f183
Show file tree
Hide file tree
Showing 77 changed files with 205 additions and 98 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ void ContextualSearchDelegate::ResolveSearchTermFromContext() {
GetDiscourseContext(*context_));

// Disable cookies for this request.
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;

// Add Chrome experiment state to the request headers.
// Reset will delete any previous loader, and we won't get any callback.
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/android/feedback/connectivity_checker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ ConnectivityChecker::ConnectivityChecker(
void ConnectivityChecker::StartAsyncCheck() {
auto request = std::make_unique<network::ResourceRequest>();
request->url = url_;
request->credentials_mode = network::mojom::CredentialsMode::kOmit;
request->allow_credentials = false;
request->load_flags = net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE;
url_loader_ = network::SimpleURLLoader::Create(std::move(request),
NO_TRAFFIC_ANNOTATION_YET);
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/android/rlz/rlz_ping_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ void RlzPingHandler::Ping(
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = request_url;
resource_request->load_flags = net::LOAD_DISABLE_CACHE;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;

simple_url_loader_ = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation);
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/android/webapk/webapk_installer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ void WebApkInstaller::SendRequest(
request->url = server_url_;
request->method = "POST";
request->load_flags = net::LOAD_DISABLE_CACHE;
request->credentials_mode = network::mojom::CredentialsMode::kOmit;
request->allow_credentials = false;
loader_ = network::SimpleURLLoader::Create(std::move(request),
NO_TRAFFIC_ANNOTATION_YET);
loader_->AttachStringForUpload(*serialized_proto, kProtoMimeType);
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/availability/availability_prober.cc
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ void AvailabilityProber::CreateAndStartURLLoader() {
request->method = HttpMethodToString(http_method_);
request->headers = headers_;
request->load_flags = net::LOAD_DISABLE_CACHE;
request->credentials_mode = network::mojom::CredentialsMode::kOmit;
request->allow_credentials = false;

url_loader_ =
network::SimpleURLLoader::Create(std::move(request), traffic_annotation_);
Expand Down
3 changes: 1 addition & 2 deletions chrome/browser/availability/availability_prober_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ class AvailabilityProberTest : public testing::Test {
EXPECT_EQ(testing_header, "Hello world");
EXPECT_EQ(request->request.method, "GET");
EXPECT_EQ(request->request.load_flags, net::LOAD_DISABLE_CACHE);
EXPECT_EQ(request->request.credentials_mode,
network::mojom::CredentialsMode::kOmit);
EXPECT_FALSE(request->request.allow_credentials);
if (expect_random_guid) {
EXPECT_NE(request->request.url, kTestUrl);
EXPECT_TRUE(request->request.url.query().find("guid=") !=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void XmlDownloader::FetchXml() {
auto request = std::make_unique<network::ResourceRequest>();
request->url = source.url;
request->load_flags = net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE;
request->credentials_mode = network::mojom::CredentialsMode::kOmit;
request->allow_credentials = false;
source.url_loader = network::SimpleURLLoader::Create(std::move(request),
traffic_annotation);
source.url_loader->SetRetryOptions(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class BackdropFetcher {
resource_request->method = "POST";
resource_request->load_flags =
net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;

simple_loader_ = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ void ServicesCustomizationDocument::DoStartFileFetch() {
auto request = std::make_unique<network::ResourceRequest>();
request->url = url_;
request->load_flags = net::LOAD_DISABLE_CACHE;
request->credentials_mode = network::mojom::CredentialsMode::kOmit;
request->allow_credentials = false;
request->headers.SetHeader("Accept", "application/json");

url_loader_ = network::SimpleURLLoader::Create(std::move(request),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void CustomizationWallpaperDownloader::StartRequest() {
resource_request->url = wallpaper_url_;
resource_request->load_flags =
net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
// TODO(crbug.com/833390): Add a real traffic annotation here.
simple_loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
MISSING_TRAFFIC_ANNOTATION);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void WilcoDtcSupportdWebRequestService::PerformRequest(
request->request = std::make_unique<network::ResourceRequest>();
request->request->method = http_method_str;
request->request->url = std::move(url);
request->request->credentials_mode = network::mojom::CredentialsMode::kOmit;
request->request->allow_credentials = false;
request->request->load_flags = net::LOAD_DISABLE_CACHE;
for (auto header : headers) {
request->request->headers.AddHeaderFromString(header);
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/intranet_redirect_detector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void IntranetRedirectDetector::FinishSleep() {
resource_request->method = "HEAD";
// We don't want these fetches to affect existing state in the profile.
resource_request->load_flags = net::LOAD_DISABLE_CACHE;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
network::mojom::URLLoaderFactory* loader_factory =
g_browser_process->system_network_context_manager()
->GetURLLoaderFactory();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void DialURLFetcher::Start(const GURL& url,
// help.
// net::LOAD_DISABLE_CACHE: The request should not touch the cache.
request->load_flags = net::LOAD_BYPASS_PROXY | net::LOAD_DISABLE_CACHE;
request->credentials_mode = network::mojom::CredentialsMode::kOmit;
request->allow_credentials = false;

loader_ = network::SimpleURLLoader::Create(std::move(request),
kDialUrlFetcherTrafficAnnotation);
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/cloud_print/privet_url_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void PrivetURLLoader::Try() {
request->method = request_type_;
// Privet requests are relevant to hosts on local network only.
request->load_flags = net::LOAD_BYPASS_PROXY | net::LOAD_DISABLE_CACHE;
request->credentials_mode = network::mojom::CredentialsMode::kOmit;
request->allow_credentials = false;

std::string token = GetPrivetAccessToken();
if (token.empty())
Expand Down
6 changes: 3 additions & 3 deletions chrome/browser/search/background/ntp_background_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ void NtpBackgroundService::FetchCollectionInfo() {
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = collections_api_url_;
resource_request->method = "POST";
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;

collections_loader_ = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation);
Expand Down Expand Up @@ -197,7 +197,7 @@ void NtpBackgroundService::FetchCollectionImageInfo(
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = collection_images_api_url_;
resource_request->method = "POST";
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;

collections_image_info_loader_ = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation);
Expand Down Expand Up @@ -294,7 +294,7 @@ void NtpBackgroundService::FetchNextCollectionImage(
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = next_image_api_url_;
resource_request->method = "POST";
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;

next_image_loader_ = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,7 @@ void OneGoogleBarLoaderImpl::AuthenticatedURLLoader::Start() {

auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = api_url_;
resource_request->credentials_mode =
network::mojom::CredentialsMode::kInclude;
resource_request->allow_credentials = true;
SetRequestHeaders(resource_request.get());
resource_request->request_initiator =
url::Origin::Create(GURL(chrome::kChromeUINewTabURL));
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/search/promos/promo_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void PromoService::Refresh() {

auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = GetApiUrl();
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
resource_request->request_initiator =
url::Origin::Create(GURL(chrome::kChromeUINewTabURL));

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ssl/common_name_mismatch_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void CommonNameMismatchHandler::CheckSuggestedUrl(
// since then the connection may be reused without checking the cert.
resource_request->url = check_url_;
resource_request->method = "HEAD";
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;

simple_url_loader_ = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation);
Expand Down
2 changes: 1 addition & 1 deletion chromeos/geolocation/simple_geolocation_request.cc
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ void SimpleGeolocationRequest::StartRequest() {
request->url = request_url_;
request->method = "POST";
request->load_flags = net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE;
request->credentials_mode = network::mojom::CredentialsMode::kOmit;
request->allow_credentials = false;

simple_url_loader_ = network::SimpleURLLoader::Create(
std::move(request), NO_TRAFFIC_ANNOTATION_YET);
Expand Down
3 changes: 1 addition & 2 deletions chromeos/printing/ppd_provider.cc
Original file line number Diff line number Diff line change
Expand Up @@ -775,8 +775,7 @@ class PpdProviderImpl : public PpdProvider {
resource_request->url = url;
resource_request->load_flags =
net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE;
resource_request->credentials_mode =
network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;

// TODO(luum): confirm correct traffic annotation
fetcher_ = network::SimpleURLLoader::Create(std::move(resource_request),
Expand Down
2 changes: 1 addition & 1 deletion chromeos/timezone/timezone_request.cc
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ void TimeZoneRequest::StartRequest() {
auto request = std::make_unique<network::ResourceRequest>();
request->url = request_url_;
request->load_flags = net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE;
request->credentials_mode = network::mojom::CredentialsMode::kOmit;
request->allow_credentials = false;
url_loader_ = network::SimpleURLLoader::Create(std::move(request),
NO_TRAFFIC_ANNOTATION_YET);

Expand Down
2 changes: 1 addition & 1 deletion components/autofill_assistant/browser/service_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void ServiceImpl::StartLoader(Loader* loader) {
auto resource_request = std::make_unique<::network::ResourceRequest>();
resource_request->method = "POST";
resource_request->redirect_mode = ::network::mojom::RedirectMode::kError;
resource_request->credentials_mode = ::network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
if (access_token_.empty()) {
std::string query_str = base::StrCat({"key=", api_key_});
// query_str must remain valid until ReplaceComponents() has returned.
Expand Down
2 changes: 1 addition & 1 deletion components/captive_portal/captive_portal_detector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void CaptivePortalDetector::StartProbe(
// Can't safely use net::LOAD_DISABLE_CERT_NETWORK_FETCHES here,
// since then the connection may be reused without checking the cert.
resource_request->load_flags = net::LOAD_BYPASS_CACHE;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;

simple_loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
traffic_annotation);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ void DataReductionProxyPingbackClientImpl::CreateLoaderForDataAndStart() {
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = pingback_url_;
resource_request->load_flags = net::LOAD_BYPASS_PROXY;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
resource_request->method = "POST";
// Attach variations headers.
variations::AppendVariationsHeader(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ void DataReductionProxyConfigServiceClient::RetrieveRemoteConfig() {
resource_request->url = config_service_url_;
resource_request->method = "POST";
resource_request->load_flags = net::LOAD_BYPASS_PROXY;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
// Attach variations headers.
url_loader_ = variations::CreateSimpleURLLoaderWithVariationsHeader(
std::move(resource_request), variations::InIncognito::kNo,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void SecureProxyChecker::CheckIfSecureProxyIsAllowed(
resource_request->url = params::GetSecureProxyCheckURL();
resource_request->load_flags =
net::LOAD_DISABLE_CACHE | net::LOAD_BYPASS_PROXY;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
url_loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
traffic_annotation);

Expand Down
2 changes: 1 addition & 1 deletion components/feed/core/feed_networking_host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ std::unique_ptr<network::SimpleURLLoader> NetworkFetch::MakeLoader() {
resource_request->url = url;

resource_request->load_flags = net::LOAD_BYPASS_CACHE;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
resource_request->method = request_type_;
SetRequestHeaders(resource_request.get());

Expand Down
2 changes: 1 addition & 1 deletion components/feedback/feedback_uploader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ void FeedbackUploader::DispatchReport() {
})");
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = feedback_post_url_;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
resource_request->method = "POST";

// Tell feedback server about the variation state of this install.
Expand Down
2 changes: 1 addition & 1 deletion components/gcm_driver/gcm_channel_status_request.cc
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void GCMChannelStatusRequest::Start() {
auto resource_request = std::make_unique<network::ResourceRequest>();

resource_request->url = request_url;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
resource_request->method = "POST";
resource_request->headers.SetHeader(net::HttpRequestHeaders::kUserAgent,
user_agent_);
Expand Down
2 changes: 1 addition & 1 deletion components/history/core/browser/web_history_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class RequestImpl : public WebHistoryService::Request {
})");
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = url_;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
resource_request->method = post_data_ ? "POST" : "GET";
resource_request->headers.SetHeader(net::HttpRequestHeaders::kAuthorization,
"Bearer " + access_token_info.token);
Expand Down
4 changes: 1 addition & 3 deletions components/image_fetcher/core/image_data_fetcher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ void ImageDataFetcher::FetchImageData(
request->url = image_url;
request->referrer_policy = referrer_policy;
request->referrer = GURL(referrer);
request->credentials_mode = send_cookies
? network::mojom::CredentialsMode::kInclude
: network::mojom::CredentialsMode::kOmit;
request->allow_credentials = send_cookies;

std::unique_ptr<network::SimpleURLLoader> loader =
network::SimpleURLLoader::Create(std::move(request), traffic_annotation);
Expand Down
6 changes: 2 additions & 4 deletions components/image_fetcher/core/image_data_fetcher_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ TEST_F(ImageDataFetcherTest, FetchImageData) {
// provide a response.
const network::ResourceRequest* pending_request;
EXPECT_TRUE(test_url_loader_factory_.IsPending(kImageURL, &pending_request));
EXPECT_EQ(pending_request->credentials_mode,
network::mojom::CredentialsMode::kOmit);
EXPECT_FALSE(pending_request->allow_credentials);

network::ResourceResponseHead head;
std::string raw_header =
Expand Down Expand Up @@ -116,8 +115,7 @@ TEST_F(ImageDataFetcherTest, FetchImageDataWithCookies) {
// provide a response.
const network::ResourceRequest* pending_request;
EXPECT_TRUE(test_url_loader_factory_.IsPending(kImageURL, &pending_request));
EXPECT_EQ(pending_request->credentials_mode,
network::mojom::CredentialsMode::kInclude);
EXPECT_TRUE(pending_request->allow_credentials);

network::ResourceResponseHead head;
std::string raw_header =
Expand Down
2 changes: 1 addition & 1 deletion components/invalidation/impl/gcm_network_channel.cc
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ void GCMNetworkChannel::OnGetTokenComplete(

auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = BuildUrl(registration_id_);
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
resource_request->method = "POST";
resource_request->headers.SetHeader(net::HttpRequestHeaders::kAuthorization,
"Bearer " + access_token_);
Expand Down
2 changes: 1 addition & 1 deletion components/metrics/net/net_metrics_log_uploader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ void NetMetricsLogUploader::UploadLogToURL(
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = url;
// Drop cookies and auth data.
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
resource_request->method = "POST";

std::string reporting_info_string = SerializeReportingInfo(reporting_info);
Expand Down
2 changes: 1 addition & 1 deletion components/network_time/network_time_tracker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ void NetworkTimeTracker::CheckTime() {
// Not expecting any cookies, but just in case.
resource_request->load_flags =
net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
// This cancels any outstanding fetch.
time_fetcher_ = network::SimpleURLLoader::Create(std::move(resource_request),
traffic_annotation);
Expand Down
2 changes: 1 addition & 1 deletion components/ntp_snippets/remote/json_request.cc
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ std::unique_ptr<network::ResourceRequest>
JsonRequest::Builder::BuildResourceRequest() const {
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = url_;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
resource_request->method = "POST";
resource_request->headers.SetHeader("Content-Type",
"application/json; charset=UTF-8");
Expand Down
2 changes: 1 addition & 1 deletion components/ntp_tiles/popular_sites_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ void PopularSitesImpl::FetchPopularSites() {
})");
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = pending_url_;
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;
simple_url_loader_ = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation);
simple_url_loader_->SetRetryOptions(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ PrefetchRequestFetcher::PrefetchRequestFetcher(
auto resource_request = std::make_unique<network::ResourceRequest>();
resource_request->url = url;
resource_request->method = message.empty() ? "GET" : "POST";
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
resource_request->allow_credentials = false;

std::string experiment_header = PrefetchExperimentHeader();
if (!experiment_header.empty())
Expand Down
2 changes: 1 addition & 1 deletion components/omnibox/browser/remote_suggestions_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ void RemoteSuggestionsService::CreateExperimentalRequest(
std::string request_body =
FormatRequestBodyExperimentalService(current_url, visit_time);
AddVariationHeaders(request.get());
request->credentials_mode = network::mojom::CredentialsMode::kOmit;
request->allow_credentials = false;

// If authentication services are unavailable or if this request is still
// waiting for an oauth2 token, run the remote service without access
Expand Down
Loading

0 comments on commit ae8f183

Please sign in to comment.