chore: bump chromium to f5b345dd470f14eef6e44732ccf23 (master) (#20649)
This commit is contained in:
parent
fb8b1fd1c9
commit
b6246dcf12
154 changed files with 1490 additions and 1197 deletions
|
@ -9,7 +9,7 @@
|
|||
#include "base/bind.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "content/public/browser/storage_partition.h"
|
||||
#include "mojo/public/cpp/bindings/interface_request.h"
|
||||
#include "mojo/public/cpp/bindings/pending_remote.h"
|
||||
#include "net/proxy_resolution/proxy_info.h"
|
||||
#include "services/network/public/mojom/network_context.mojom.h"
|
||||
#include "shell/browser/atom_browser_context.h"
|
||||
|
@ -19,12 +19,12 @@ using content::BrowserThread;
|
|||
namespace electron {
|
||||
|
||||
ResolveProxyHelper::ResolveProxyHelper(AtomBrowserContext* browser_context)
|
||||
: binding_(this), browser_context_(browser_context) {}
|
||||
: browser_context_(browser_context) {}
|
||||
|
||||
ResolveProxyHelper::~ResolveProxyHelper() {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
DCHECK(!owned_self_);
|
||||
DCHECK(!binding_.is_bound());
|
||||
DCHECK(!receiver_.is_bound());
|
||||
// Clear all pending requests if the ProxyService is still alive.
|
||||
pending_requests_.clear();
|
||||
}
|
||||
|
@ -36,7 +36,7 @@ void ResolveProxyHelper::ResolveProxy(const GURL& url,
|
|||
pending_requests_.emplace_back(url, std::move(callback));
|
||||
|
||||
// If nothing is in progress, start.
|
||||
if (!binding_.is_bound()) {
|
||||
if (!receiver_.is_bound()) {
|
||||
DCHECK_EQ(1u, pending_requests_.size());
|
||||
StartPendingRequest();
|
||||
}
|
||||
|
@ -44,13 +44,13 @@ void ResolveProxyHelper::ResolveProxy(const GURL& url,
|
|||
|
||||
void ResolveProxyHelper::StartPendingRequest() {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
DCHECK(!binding_.is_bound());
|
||||
DCHECK(!receiver_.is_bound());
|
||||
DCHECK(!pending_requests_.empty());
|
||||
|
||||
// Start the request.
|
||||
network::mojom::ProxyLookupClientPtr proxy_lookup_client;
|
||||
binding_.Bind(mojo::MakeRequest(&proxy_lookup_client));
|
||||
binding_.set_connection_error_handler(
|
||||
mojo::PendingRemote<network::mojom::ProxyLookupClient> proxy_lookup_client =
|
||||
receiver_.BindNewPipeAndPassRemote();
|
||||
receiver_.set_disconnect_handler(
|
||||
base::BindOnce(&ResolveProxyHelper::OnProxyLookupComplete,
|
||||
base::Unretained(this), net::ERR_ABORTED, base::nullopt));
|
||||
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
|
||||
|
@ -65,7 +65,7 @@ void ResolveProxyHelper::OnProxyLookupComplete(
|
|||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
DCHECK(!pending_requests_.empty());
|
||||
|
||||
binding_.Close();
|
||||
receiver_.reset();
|
||||
|
||||
// Clear the current (completed) request.
|
||||
PendingRequest completed_request = std::move(pending_requests_.front());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue