diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 18:20:14 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 18:20:14 +0000 |
| commit | 0378bf4edc40686bac06c8e14bd25fdb3f9cfb28 (patch) | |
| tree | ee5543b43dd9743d75e1aa8f16692dcfca6c813f /net | |
| parent | d028296ec1c0fdfbd40e2390ca3121de7055295d (diff) | |
| download | chromium_src-0378bf4edc40686bac06c8e14bd25fdb3f9cfb28.zip chromium_src-0378bf4edc40686bac06c8e14bd25fdb3f9cfb28.tar.gz chromium_src-0378bf4edc40686bac06c8e14bd25fdb3f9cfb28.tar.bz2 | |
Move base/mac_util.h to base/mac and use the base::mac namespace.
Fix up callers to use the new location & namespace. Remove includes from
files where it wasn't necessary.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6046009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/proxy/proxy_config_service_mac.cc | 8 | ||||
| -rw-r--r-- | net/proxy/proxy_resolver_mac.cc | 4 | ||||
| -rw-r--r-- | net/proxy/proxy_server_mac.cc | 6 |
3 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 c6faa27..3dacf77 100644 --- a/net/proxy/proxy_config_service_mac.cc +++ b/net/proxy/proxy_config_service_mac.cc @@ -8,7 +8,7 @@ #include <SystemConfiguration/SystemConfiguration.h> #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/sys_string_conversions.h" #include "net/base/net_errors.h" @@ -27,7 +27,7 @@ const int kPollIntervalSec = 5; bool GetBoolFromDictionary(CFDictionaryRef dict, CFStringRef key, bool default_value) { - CFNumberRef number = (CFNumberRef)mac_util::GetValueFromDictionary( + CFNumberRef number = (CFNumberRef)base::mac::GetValueFromDictionary( dict, key, CFNumberGetTypeID()); if (!number) return default_value; @@ -59,7 +59,7 @@ void GetCurrentProxyConfig(ProxyConfig* config) { if (GetBoolFromDictionary(config_dict.get(), kSCPropNetProxiesProxyAutoConfigEnable, false)) { - CFStringRef pac_url_ref = (CFStringRef)mac_util::GetValueFromDictionary( + CFStringRef pac_url_ref = (CFStringRef)base::mac::GetValueFromDictionary( config_dict.get(), kSCPropNetProxiesProxyAutoConfigURLString, CFStringGetTypeID()); @@ -129,7 +129,7 @@ void GetCurrentProxyConfig(ProxyConfig* config) { // proxy bypass list CFArrayRef bypass_array_ref = - (CFArrayRef)mac_util::GetValueFromDictionary( + (CFArrayRef)base::mac::GetValueFromDictionary( config_dict.get(), kSCPropNetProxiesExceptionsList, CFArrayGetTypeID()); diff --git a/net/proxy/proxy_resolver_mac.cc b/net/proxy/proxy_resolver_mac.cc index 128450f..31d9b61 100644 --- a/net/proxy/proxy_resolver_mac.cc +++ b/net/proxy/proxy_resolver_mac.cc @@ -7,7 +7,7 @@ #include <CoreFoundation/CoreFoundation.h> #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" @@ -154,7 +154,7 @@ int ProxyResolverMac::GetProxyForURL(const GURL& query_url, // PAC file, I'm going home. CFStringRef proxy_type = - (CFStringRef)mac_util::GetValueFromDictionary(proxy_dictionary, + (CFStringRef)base::mac::GetValueFromDictionary(proxy_dictionary, kCFProxyTypeKey, CFStringGetTypeID()); ProxyServer proxy_server = ProxyServer::FromDictionary( diff --git a/net/proxy/proxy_server_mac.cc b/net/proxy/proxy_server_mac.cc index 61e320f..566d25e 100644 --- a/net/proxy/proxy_server_mac.cc +++ b/net/proxy/proxy_server_mac.cc @@ -9,7 +9,7 @@ #include <string> #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" namespace net { @@ -25,7 +25,7 @@ ProxyServer ProxyServer::FromDictionary(Scheme scheme, } CFStringRef host_ref = - (CFStringRef)mac_util::GetValueFromDictionary(dict, host_key, + (CFStringRef)base::mac::GetValueFromDictionary(dict, host_key, CFStringGetTypeID()); if (!host_ref) { LOG(WARNING) << "Could not find expected key " @@ -36,7 +36,7 @@ ProxyServer ProxyServer::FromDictionary(Scheme scheme, std::string host = base::SysCFStringRefToUTF8(host_ref); CFNumberRef port_ref = - (CFNumberRef)mac_util::GetValueFromDictionary(dict, port_key, + (CFNumberRef)base::mac::GetValueFromDictionary(dict, port_key, CFNumberGetTypeID()); int port; if (port_ref) { |