Move base/mac_util.h to base/mac and use the base::mac namespace....

net/proxy/proxy_config_service_mac.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/proxy_config_service_mac.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #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"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_server.h"
 
 namespace net {
 
 namespace {
 
 const int kPollIntervalSec = 5;
 
 // Utility function to pull out a boolean value from a dictionary and return it,
 // returning a default value if the key is not present.
 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;
 
   int int_value;
   if (CFNumberGetValue(number, kCFNumberIntType, &int_value))
     return int_value;
   else
     return default_value;
 }
@@ skipping 11 matching lines @@
   config->set_auto_detect(
       GetBoolFromDictionary(config_dict.get(),
                             kSCPropNetProxiesProxyAutoDiscoveryEnable,
                             false));
 
   // PAC file
 
   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());
     if (pac_url_ref)
       config->set_pac_url(GURL(base::SysCFStringRefToUTF8(pac_url_ref)));
   }
 
   // proxies (for now ftp, http, https, and SOCKS)
 
   if (GetBoolFromDictionary(config_dict.get(),
@@ skipping 49 matching lines @@
     if (proxy_server.is_valid()) {
       config->proxy_rules().type =
           ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
       config->proxy_rules().fallback_proxy = proxy_server;
     }
   }
 
   // proxy bypass list
 
   CFArrayRef bypass_array_ref =
-      (CFArrayRef)mac_util::GetValueFromDictionary(
+      (CFArrayRef)base::mac::GetValueFromDictionary(
           config_dict.get(),
           kSCPropNetProxiesExceptionsList,
           CFArrayGetTypeID());
   if (bypass_array_ref) {
     CFIndex bypass_array_count = CFArrayGetCount(bypass_array_ref);
     for (CFIndex i = 0; i < bypass_array_count; ++i) {
       CFStringRef bypass_item_ref =
           (CFStringRef)CFArrayGetValueAtIndex(bypass_array_ref, i);
       if (CFGetTypeID(bypass_item_ref) != CFStringGetTypeID()) {
         LOG(WARNING) << "Expected value for item " << i
@@ skipping 116 matching lines @@
 
   // Keep track of the last value we have seen.
   has_fetched_config_ = true;
   last_config_fetched_ = new_config;
 
   // Notify all the observers.
   FOR_EACH_OBSERVER(Observer, observers_, OnProxyConfigChanged(new_config));
 }
 
 }  // namespace net