mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to f156cb7658ec5382f5623a05841c6 (master) (#19096)

Browse source 
* chore: bump chromium in DEPS to 37cd06a295cf156cb7658ec5382f5623a05841c6

* update patches

* fix: replace NO_TRAFFIC_ANNOTATION_YET with MISSING_TRAFFIC_ANNOTATION

Refs: 1653256
This commit is contained in:
Electron Bot 2019-07-03 14:48:55 -07:00 • committed by Samuel Attard
parent ae01a48fca
commit d362be5cd9
24 changed files with 59 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/api/atom_api_web_contents.cc
View file

@ -1355,7 +1355,7 @@ void WebContents::DownloadURL(const GURL& url) {
content::BrowserContext::GetDownloadManager(browser_context);
std::unique_ptr<download::DownloadUrlParameters> download_params(
content::DownloadRequestUtils::CreateDownloadForWebContentsMainFrame(
web_contents(), url, NO_TRAFFIC_ANNOTATION_YET));
web_contents(), url, MISSING_TRAFFIC_ANNOTATION));
download_manager->DownloadUrl(std::move(download_params));
}

5
shell/browser/net/atom_url_request.cc
View file

@ -115,8 +115,9 @@ void AtomURLRequest::DoInitialize(
}
DCHECK(context);
request_ = context->CreateRequest(
GURL(url), net::RequestPriority::DEFAULT_PRIORITY, this);
request_ =
context->CreateRequest(GURL(url), net::RequestPriority::DEFAULT_PRIORITY,
this, MISSING_TRAFFIC_ANNOTATION);
if (!request_) {
DoCancelWithError("Failed to create a net::URLRequest.", true);
return;

3
shell/browser/net/url_request_fetch_job.cc
View file

@ -188,7 +188,8 @@ void URLRequestFetchJob::StartAsync(
else
request_type = GetRequestType(method);
fetcher_ = net::URLFetcher::Create(formated_url, request_type, this);
fetcher_ = net::URLFetcher::Create(formated_url, request_type, this,
MISSING_TRAFFIC_ANNOTATION);
fetcher_->SaveResponseWithWriter(base::WrapUnique(new ResponsePiper(this)));
// A request context getter is passed by the user.

2
shell/browser/ui/inspectable_web_contents_impl.cc
View file

@ -536,7 +536,7 @@ void InspectableWebContentsImpl::LoadNetworkResource(
auto factory = partition->GetURLLoaderFactoryForBrowserProcess();
auto simple_url_loader = network::SimpleURLLoader::Create(
std::move(resource_request), NO_TRAFFIC_ANNOTATION_YET);
std::move(resource_request), MISSING_TRAFFIC_ANNOTATION);
auto resource_loader = std::make_unique<NetworkResourceLoader>(
stream_id, this, std::move(simple_url_loader), factory.get(), callback);
loaders_.insert(std::move(resource_loader));

4
shell/browser/ui/webui/pdf_viewer_ui.cc
View file

@ -133,8 +133,8 @@ class PdfViewerUI::ResourceRequester
const net::URLRequestContext* request_context =
resource_context->GetRequestContext();
std::unique_ptr<net::URLRequest> request(
request_context->CreateRequest(url, net::DEFAULT_PRIORITY, nullptr));
std::unique_ptr<net::URLRequest> request(request_context->CreateRequest(
url, net::DEFAULT_PRIORITY, nullptr, MISSING_TRAFFIC_ANNOTATION));
request->set_method("GET");
content::ResourceDispatcherHostImpl::Get()->InitializeURLRequest(