| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" | 5 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolution_service_provider_
delegate.h" |
| 6 | 6 |
| 7 #include "chrome/browser/profiles/profile_manager.h" | 7 #include "chrome/browser/profiles/profile_manager.h" |
| 8 #include "net/log/net_log_with_source.h" | 8 #include "net/log/net_log_with_source.h" |
| 9 #include "net/proxy/proxy_service.h" | 9 #include "net/proxy/proxy_service.h" |
| 10 #include "net/url_request/url_request_context_getter.h" | 10 #include "net/url_request/url_request_context_getter.h" |
| 11 | 11 |
| 12 namespace chromeos { | 12 namespace chromeos { |
| 13 | 13 |
| 14 ChromeProxyResolverDelegate::ChromeProxyResolverDelegate() {} | 14 ChromeProxyResolutionServiceProviderDelegate:: |
| 15 ChromeProxyResolutionServiceProviderDelegate() {} |
| 15 | 16 |
| 16 ChromeProxyResolverDelegate::~ChromeProxyResolverDelegate() {} | 17 ChromeProxyResolutionServiceProviderDelegate:: |
| 18 ~ChromeProxyResolutionServiceProviderDelegate() {} |
| 17 | 19 |
| 18 scoped_refptr<net::URLRequestContextGetter> | 20 scoped_refptr<net::URLRequestContextGetter> |
| 19 ChromeProxyResolverDelegate::GetRequestContext() { | 21 ChromeProxyResolutionServiceProviderDelegate::GetRequestContext() { |
| 20 Profile* profile = ProfileManager::GetPrimaryUserProfile(); | 22 Profile* profile = ProfileManager::GetPrimaryUserProfile(); |
| 21 return profile->GetRequestContext(); | 23 return profile->GetRequestContext(); |
| 22 } | 24 } |
| 23 | 25 |
| 24 int ChromeProxyResolverDelegate::ResolveProxy( | 26 int ChromeProxyResolutionServiceProviderDelegate::ResolveProxy( |
| 25 net::ProxyService* proxy_service, | 27 net::ProxyService* proxy_service, |
| 26 const GURL& url, | 28 const GURL& url, |
| 27 net::ProxyInfo* results, | 29 net::ProxyInfo* results, |
| 28 const net::CompletionCallback& callback) { | 30 const net::CompletionCallback& callback) { |
| 29 DCHECK(proxy_service); | 31 DCHECK(proxy_service); |
| 30 DCHECK(results); | 32 DCHECK(results); |
| 31 return proxy_service->ResolveProxy(url, std::string(), results, callback, | 33 return proxy_service->ResolveProxy(url, std::string(), results, callback, |
| 32 nullptr, nullptr, net::NetLogWithSource()); | 34 nullptr, nullptr, net::NetLogWithSource()); |
| 33 } | 35 } |
| 34 | 36 |
| 35 } // namespace chromeos | 37 } // namespace chromeos |
| OLD | NEW |