net/proxy/proxy_service.cc - Issue 1841863002: Update monet.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/proxy/proxy_service.cc

Issue 1841863002: Update monet. (Closed) Base URL: https://github.com/domokit/monet.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: net/proxy/proxy_service.cc

diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc

index 46300e8619276c4b16ec6f2f40d790d89d4c9654..74db661088b125811064761404935372feaf0c34 100644

--- a/net/proxy/proxy_service.cc

+++ b/net/proxy/proxy_service.cc

@@ -12,7 +12,6 @@

#include "base/logging.h"

#include "base/memory/weak_ptr.h"

#include "base/message_loop/message_loop.h"

-#include "base/message_loop/message_loop_proxy.h"

#include "base/metrics/histogram_macros.h"

#include "base/strings/string_util.h"

#include "base/thread_task_runner_handle.h"

@@ -1540,7 +1539,7 @@ ProxyConfigService* ProxyService::CreateSystemProxyConfigService(

return linux_config_service;

#elif defined(OS_ANDROID)

return new ProxyConfigServiceAndroid(

- io_task_runner, base::MessageLoop::current()->message_loop_proxy());

+ io_task_runner, base::MessageLoop::current()->task_runner());

#else

LOG(WARNING) << "Failed to choose a system proxy settings fetcher "

"for this platform.";

« no previous file with comments | « net/proxy/proxy_server.cc ('k') | net/proxy/proxy_service_mojo.cc » ('j') | no next file with comments »