mac: Update clients of scoped_nsobject.h.

crypto/apple_keychain_ios.mm

 // Copyright (c) 2012 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 "crypto/apple_keychain.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 
 namespace {
 
 enum KeychainAction {
   kKeychainActionCreate,
   kKeychainActionUpdate
 };
 
 // Creates a dictionary that can be used to query the keystore.
 // Ownership follows the Create rule.
 CFDictionaryRef CreateGenericPasswordQuery(UInt32 serviceNameLength,
                                            const char* serviceName,
                                            UInt32 accountNameLength,
                                            const char* accountName) {
   CFMutableDictionaryRef query =
       CFDictionaryCreateMutable(NULL,
                                 5,
                                 &kCFTypeDictionaryKeyCallBacks,
                                 &kCFTypeDictionaryValueCallBacks);
   // Type of element is generic password.
   CFDictionarySetValue(query, kSecClass, kSecClassGenericPassword);
 
   // Set the service name.
-  scoped_nsobject<NSString> service_name_ns(
+  base::scoped_nsobject<NSString> service_name_ns(
       [[NSString alloc] initWithBytes:serviceName
                                length:serviceNameLength
                              encoding:NSUTF8StringEncoding]);
   CFDictionarySetValue(query, kSecAttrService,
                        base::mac::NSToCFCast(service_name_ns));
 
   // Set the account name.
-  scoped_nsobject<NSString> account_name_ns(
+  base::scoped_nsobject<NSString> account_name_ns(
       [[NSString alloc] initWithBytes:accountName
                                length:accountNameLength
                              encoding:NSUTF8StringEncoding]);
   CFDictionarySetValue(query, kSecAttrAccount,
                        base::mac::NSToCFCast(account_name_ns));
 
   // Use the proper search constants, return only the data of the first match.
   CFDictionarySetValue(query, kSecMatchLimit, kSecMatchLimitOne);
   CFDictionarySetValue(query, kSecReturnData, kCFBooleanTrue);
   return query;
@@ skipping 25 matching lines @@
 
   // Set the type of the data.
   CFDictionarySetValue(keychain_data, kSecClass, kSecClassGenericPassword);
 
   // Only allow access when the device has been unlocked.
   CFDictionarySetValue(keychain_data,
                        kSecAttrAccessible,
                        kSecAttrAccessibleWhenUnlocked);
 
   // Set the service name.
-  scoped_nsobject<NSString> service_name_ns(
+  base::scoped_nsobject<NSString> service_name_ns(
       [[NSString alloc] initWithBytes:serviceName
                                length:serviceNameLength
                              encoding:NSUTF8StringEncoding]);
   CFDictionarySetValue(keychain_data, kSecAttrService,
                        base::mac::NSToCFCast(service_name_ns));
 
   // Set the account name.
-  scoped_nsobject<NSString> account_name_ns(
+  base::scoped_nsobject<NSString> account_name_ns(
       [[NSString alloc] initWithBytes:accountName
                                length:accountNameLength
                              encoding:NSUTF8StringEncoding]);
   CFDictionarySetValue(keychain_data, kSecAttrAccount,
                        base::mac::NSToCFCast(account_name_ns));
 
   return keychain_data;
 }
 
 }  // namespace
@@ skipping 79 matching lines @@
     CFDataRef data = base::mac::CFCast<CFDataRef>(result);
     NSUInteger length = CFDataGetLength(data);
     *passwordData = malloc(length * sizeof(UInt8));
     CFDataGetBytes(data, CFRangeMake(0, length), (UInt8*)*passwordData);
     *passwordLength = length;
   }
   return status;
 }
 
 }  // namespace crypto