From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 18 Oct 2018 17:07:12 -0700 Subject: proxy_config_monitor.patch Allow monitoring proxy config changes for a pref service. diff --git a/chrome/browser/net/proxy_config_monitor.cc b/chrome/browser/net/proxy_config_monitor.cc index 55cc762b92193ed3f65b4d0b562202869530e1ac..d4c2a4e49eb469d3e2278fdc972c0aedc849d3f6 100644 --- a/chrome/browser/net/proxy_config_monitor.cc +++ b/chrome/browser/net/proxy_config_monitor.cc @@ -11,7 +11,9 @@ #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/proxy_service_factory.h" +#if 0 #include "chrome/browser/profiles/profile.h" +#endif #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "content/public/browser/browser_thread.h" #include "mojo/public/cpp/bindings/pending_remote.h" @@ -21,12 +23,13 @@ #include "chrome/browser/ash/profiles/profile_helper.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(ENABLE_EXTENSIONS) +#if 0 #include "chrome/browser/extensions/api/proxy/proxy_api.h" #endif using content::BrowserThread; +#if 0 ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK(profile); @@ -56,6 +59,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) { proxy_config_service_->AddObserver(this); } +#endif ProxyConfigMonitor::ProxyConfigMonitor(PrefService* local_state) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) || @@ -134,9 +138,11 @@ void ProxyConfigMonitor::OnLazyProxyConfigPoll() { void ProxyConfigMonitor::OnPACScriptError(int32_t line_number, const std::string& details) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); +#if 0 extensions::ProxyEventRouter::GetInstance()->OnPACScriptError( g_browser_process->extension_event_router_forwarder(), profile_, line_number, base::UTF8ToUTF16(details)); +#endif } void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings( @@ -150,9 +156,10 @@ void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings( // controlled. return; } - +#if 0 extensions::ProxyEventRouter::GetInstance()->OnProxyError( g_browser_process->extension_event_router_forwarder(), profile_, net_error); +#endif } #endif diff --git a/chrome/browser/net/proxy_config_monitor.h b/chrome/browser/net/proxy_config_monitor.h index abffb6dbdbf730e2cc4423eaca6a9a8a9f8af582..7fe1badcdebebce9028825ac98d7ab6cfa65dcdd 100644 --- a/chrome/browser/net/proxy_config_monitor.h +++ b/chrome/browser/net/proxy_config_monitor.h @@ -40,11 +40,12 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer, { public: +#if 0 // Creates a ProxyConfigMonitor that gets proxy settings from |profile| and // watches for changes. The created ProxyConfigMonitor must be destroyed // before |profile|. explicit ProxyConfigMonitor(Profile* profile); - +#endif // Creates a ProxyConfigMonitor that gets proxy settings from the // |local_state|, for use with NetworkContexts not // associated with a profile. Must be destroyed before |local_state|. @@ -91,7 +92,7 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer, #if BUILDFLAG(ENABLE_EXTENSIONS) mojo::ReceiverSet error_receiver_set_; - Profile* profile_ = nullptr; + // Profile* profile_ = nullptr; #endif DISALLOW_COPY_AND_ASSIGN(ProxyConfigMonitor);