Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

net/base/ssl_config_service_mac.cc

 // Copyright (c) 2009 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/base/ssl_config_service_mac.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace net {
 
 namespace {
 
 static const int kConfigUpdateInterval = 10;  // seconds
 
 static const bool kSSL2EnabledDefaultValue = false;
 static const bool kSSL3EnabledDefaultValue = true;
 static const bool kTLS1EnabledDefaultValue = true;
 
 static CFStringRef kRevocationPreferencesIdentifier =
     CFSTR("com.apple.security.revocation");
 static CFStringRef kOCSPStyleKey = CFSTR("OCSPStyle");
 static CFStringRef kCRLStyleKey = CFSTR("CRLStyle");
 static CFStringRef kNoneRevocationValue = CFSTR("None");
 static CFStringRef kBestAttemptRevocationValue = CFSTR("BestAttempt");
 static CFStringRef kSSL2EnabledKey = CFSTR("org.chromium.ssl.ssl2");
 static CFStringRef kSSL3EnabledKey = CFSTR("org.chromium.ssl.ssl3");
 static CFStringRef kTLS1EnabledKey = CFSTR("org.chromium.ssl.tls1");
 
 bool RevocationStyleIsEnabled(CFStringRef key) {
   CFPropertyListRef plist_ref = CFPreferencesCopyValue(key,
       kRevocationPreferencesIdentifier, kCFPreferencesCurrentUser,
       kCFPreferencesAnyHost);
   if (plist_ref) {
-    scoped_cftyperef<CFPropertyListRef> scoped_plist_ref(plist_ref);
+    base::mac::ScopedCFTypeRef<CFPropertyListRef> scoped_plist_ref(plist_ref);
     if (CFGetTypeID(plist_ref) == CFStringGetTypeID()) {
       CFStringRef style = reinterpret_cast<CFStringRef>(plist_ref);
       if (CFStringCompare(kNoneRevocationValue, style,
                           kCFCompareCaseInsensitive))
         return true;
     }
   }
   return false;
 }
 
@@ skipping 92 matching lines @@
 void SSLConfigServiceMac::UpdateConfig(TimeTicks now) {
   SSLConfig orig_config = config_info_;
   GetSSLConfigNow(&config_info_);
   if (ever_updated_)
     ProcessConfigUpdate(orig_config, config_info_);
   config_time_ = now;
   ever_updated_ = true;
 }
 
 }  // namespace net