| Index: net/proxy/proxy_resolver_mac.cc
|
| diff --git a/net/proxy/proxy_resolver_mac.cc b/net/proxy/proxy_resolver_mac.cc
|
| index 8ddf81fffe45c11cbb1ae4321216b6253f9513c8..8c315bbedcac4ab148111c51e7907d8626d3b93b 100644
|
| --- a/net/proxy/proxy_resolver_mac.cc
|
| +++ b/net/proxy/proxy_resolver_mac.cc
|
| @@ -68,7 +68,8 @@ ProxyResolverMac::ProxyResolverMac()
|
| : ProxyResolver(false /*expects_pac_bytes*/) {
|
| }
|
|
|
| -ProxyResolverMac::~ProxyResolverMac() {}
|
| +ProxyResolverMac::~ProxyResolverMac() {
|
| +}
|
|
|
| // Gets the proxy information for a query URL from a PAC. Implementation
|
| // inspired by http://developer.apple.com/samplecode/CFProxySupportTool/
|
| @@ -96,8 +97,8 @@ int ProxyResolverMac::GetProxyForURL(const GURL& query_url,
|
| // CFNetworkCopyProxiesForURL initializes some state within CFNetwork that is
|
| // required by CFNetworkExecuteProxyAutoConfigurationURL.
|
|
|
| - CFArrayRef dummy_result = CFNetworkCopyProxiesForURL(query_url_ref.get(),
|
| - NULL);
|
| + CFArrayRef dummy_result =
|
| + CFNetworkCopyProxiesForURL(query_url_ref.get(), NULL);
|
| if (dummy_result)
|
| CFRelease(dummy_result);
|
|
|
| @@ -107,7 +108,7 @@ int ProxyResolverMac::GetProxyForURL(const GURL& query_url,
|
| // runloop source we need to release despite its name.)
|
|
|
| CFTypeRef result = NULL;
|
| - CFStreamClientContext context = { 0, &result, NULL, NULL, NULL };
|
| + CFStreamClientContext context = {0, &result, NULL, NULL, NULL};
|
| base::ScopedCFTypeRef<CFRunLoopSourceRef> runloop_source(
|
| CFNetworkExecuteProxyAutoConfigurationURL(
|
| pac_url_ref.get(), query_url_ref.get(), ResultCallback, &context));
|
| @@ -117,11 +118,11 @@ int ProxyResolverMac::GetProxyForURL(const GURL& query_url,
|
| const CFStringRef private_runloop_mode =
|
| CFSTR("org.chromium.ProxyResolverMac");
|
|
|
| - CFRunLoopAddSource(CFRunLoopGetCurrent(), runloop_source.get(),
|
| - private_runloop_mode);
|
| + CFRunLoopAddSource(
|
| + CFRunLoopGetCurrent(), runloop_source.get(), private_runloop_mode);
|
| CFRunLoopRunInMode(private_runloop_mode, DBL_MAX, false);
|
| - CFRunLoopRemoveSource(CFRunLoopGetCurrent(), runloop_source.get(),
|
| - private_runloop_mode);
|
| + CFRunLoopRemoveSource(
|
| + CFRunLoopGetCurrent(), runloop_source.get(), private_runloop_mode);
|
| DCHECK(result != NULL);
|
|
|
| if (CFGetTypeID(result) == CFErrorGetTypeID()) {
|
| @@ -161,11 +162,11 @@ int ProxyResolverMac::GetProxyForURL(const GURL& query_url,
|
|
|
| CFStringRef proxy_type = base::mac::GetValueFromDictionary<CFStringRef>(
|
| proxy_dictionary, kCFProxyTypeKey);
|
| - ProxyServer proxy_server = ProxyServer::FromDictionary(
|
| - GetProxyServerScheme(proxy_type),
|
| - proxy_dictionary,
|
| - kCFProxyHostNameKey,
|
| - kCFProxyPortNumberKey);
|
| + ProxyServer proxy_server =
|
| + ProxyServer::FromDictionary(GetProxyServerScheme(proxy_type),
|
| + proxy_dictionary,
|
| + kCFProxyHostNameKey,
|
| + kCFProxyPortNumberKey);
|
| if (!proxy_server.is_valid())
|
| continue;
|
|
|
|
|