| Index: net/proxy/proxy_config_service_win.cc
|
| diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc
|
| index 828b5cca52408c34a89a01735703c1019bee8187..5077492ac52e6dd5e5e710e44d4f568c146a8ca3 100644
|
| --- a/net/proxy/proxy_config_service_win.cc
|
| +++ b/net/proxy/proxy_config_service_win.cc
|
| @@ -58,9 +58,7 @@ class ProxyConfigServiceWin::KeyEntry {
|
| return key_.Create(rootkey, subkey, KEY_NOTIFY) == ERROR_SUCCESS;
|
| }
|
|
|
| - HANDLE watch_event() const {
|
| - return key_.watch_event();
|
| - }
|
| + HANDLE watch_event() const { return key_.watch_event(); }
|
|
|
| private:
|
| base::win::RegKey key_;
|
| @@ -68,9 +66,8 @@ class ProxyConfigServiceWin::KeyEntry {
|
| };
|
|
|
| ProxyConfigServiceWin::ProxyConfigServiceWin()
|
| - : PollingProxyConfigService(
|
| - base::TimeDelta::FromSeconds(kPollIntervalSec),
|
| - &ProxyConfigServiceWin::GetCurrentProxyConfig) {
|
| + : PollingProxyConfigService(base::TimeDelta::FromSeconds(kPollIntervalSec),
|
| + &ProxyConfigServiceWin::GetCurrentProxyConfig) {
|
| }
|
|
|
| ProxyConfigServiceWin::~ProxyConfigServiceWin() {
|
| @@ -116,10 +113,9 @@ void ProxyConfigServiceWin::StartWatchingRegistryForChanges() {
|
| HKEY_LOCAL_MACHINE,
|
| L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings");
|
|
|
| - AddKeyToWatchList(
|
| - HKEY_LOCAL_MACHINE,
|
| - L"SOFTWARE\\Policies\\Microsoft\\Windows\\CurrentVersion\\"
|
| - L"Internet Settings");
|
| + AddKeyToWatchList(HKEY_LOCAL_MACHINE,
|
| + L"SOFTWARE\\Policies\\Microsoft\\Windows\\CurrentVersion\\"
|
| + L"Internet Settings");
|
| }
|
|
|
| bool ProxyConfigServiceWin::AddKeyToWatchList(HKEY rootkey,
|
| @@ -157,8 +153,8 @@ void ProxyConfigServiceWin::OnObjectSignaled(HANDLE object) {
|
| void ProxyConfigServiceWin::GetCurrentProxyConfig(ProxyConfig* config) {
|
| WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ie_config = {0};
|
| if (!WinHttpGetIEProxyConfigForCurrentUser(&ie_config)) {
|
| - LOG(ERROR) << "WinHttpGetIEProxyConfigForCurrentUser failed: " <<
|
| - GetLastError();
|
| + LOG(ERROR) << "WinHttpGetIEProxyConfigForCurrentUser failed: "
|
| + << GetLastError();
|
| *config = ProxyConfig::CreateDirect();
|
| config->set_source(PROXY_CONFIG_SOURCE_SYSTEM_FAILED);
|
| return;
|
|
|