diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
| commit | df0ca6c858762b101bf424ff6c0522409fa195fc (patch) | |
| tree | efa188eee6972e2c0de358f2d19a2348ce6dcb06 /net/proxy | |
| parent | 73de26a684944782a92f8e6840e1b290c9a424cd (diff) | |
| download | chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.zip chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.gz chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.bz2 | |
Move scoped_cftyperef from base to base/mac, use the new namespace, and name it
properly (scoped_cftyperef -> ScopedCFTypeRef).
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3855001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_config_service_mac.cc | 4 | ||||
| -rw-r--r-- | net/proxy/proxy_resolver_mac.cc | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/net/proxy/proxy_config_service_mac.cc b/net/proxy/proxy_config_service_mac.cc index a197313..c6faa27 100644 --- a/net/proxy/proxy_config_service_mac.cc +++ b/net/proxy/proxy_config_service_mac.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/mac_util.h" -#include "base/scoped_cftyperef.h" +#include "base/mac/scoped_cftyperef.h" #include "base/sys_string_conversions.h" #include "net/base/net_errors.h" #include "net/proxy/proxy_config.h" @@ -40,7 +40,7 @@ bool GetBoolFromDictionary(CFDictionaryRef dict, } void GetCurrentProxyConfig(ProxyConfig* config) { - scoped_cftyperef<CFDictionaryRef> config_dict( + base::mac::ScopedCFTypeRef<CFDictionaryRef> config_dict( SCDynamicStoreCopyProxies(NULL)); DCHECK(config_dict); diff --git a/net/proxy/proxy_resolver_mac.cc b/net/proxy/proxy_resolver_mac.cc index 8e8ef20..442715d 100644 --- a/net/proxy/proxy_resolver_mac.cc +++ b/net/proxy/proxy_resolver_mac.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/mac_util.h" -#include "base/scoped_cftyperef.h" +#include "base/mac/scoped_cftyperef.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "net/base/net_errors.h" @@ -60,19 +60,19 @@ int ProxyResolverMac::GetProxyForURL(const GURL& query_url, CompletionCallback* /*callback*/, RequestHandle* /*request*/, const BoundNetLog& net_log) { - scoped_cftyperef<CFStringRef> query_ref( + base::mac::ScopedCFTypeRef<CFStringRef> query_ref( base::SysUTF8ToCFStringRef(query_url.spec())); - scoped_cftyperef<CFURLRef> query_url_ref( + base::mac::ScopedCFTypeRef<CFURLRef> query_url_ref( CFURLCreateWithString(kCFAllocatorDefault, query_ref.get(), NULL)); if (!query_url_ref.get()) return ERR_FAILED; - scoped_cftyperef<CFStringRef> pac_ref( + base::mac::ScopedCFTypeRef<CFStringRef> pac_ref( base::SysUTF8ToCFStringRef( script_data_->type() == ProxyResolverScriptData::TYPE_AUTO_DETECT ? std::string() : script_data_->url().spec())); - scoped_cftyperef<CFURLRef> pac_url_ref( + base::mac::ScopedCFTypeRef<CFURLRef> pac_url_ref( CFURLCreateWithString(kCFAllocatorDefault, pac_ref.get(), NULL)); @@ -95,7 +95,7 @@ int ProxyResolverMac::GetProxyForURL(const GURL& query_url, CFTypeRef result = NULL; CFStreamClientContext context = { 0, &result, NULL, NULL, NULL }; - scoped_cftyperef<CFRunLoopSourceRef> runloop_source( + base::mac::ScopedCFTypeRef<CFRunLoopSourceRef> runloop_source( CFNetworkExecuteProxyAutoConfigurationURL(pac_url_ref.get(), query_url_ref.get(), ResultCallback, @@ -119,7 +119,7 @@ int ProxyResolverMac::GetProxyForURL(const GURL& query_url, return ERR_FAILED; } DCHECK(CFGetTypeID(result) == CFArrayGetTypeID()); - scoped_cftyperef<CFArrayRef> proxy_array_ref((CFArrayRef)result); + base::mac::ScopedCFTypeRef<CFArrayRef> proxy_array_ref((CFArrayRef)result); // This string will be an ordered list of <proxy-uri> entries, separated by // semi-colons. It is the format that ProxyInfo::UseNamedProxy() expects. |