mac: Update clients of scoped_nsobject.h.

1.) The header is now in base/mac instead of base/memory
2.) The class is now in namespace base.

This CL was created programmatically by running:

1.)
    git grep -l memory/scoped_nsobject.h | xargs sed -i -e 's/memory\/scoped_nsobject.h/mac\/scoped_nsobject.h/g'
    for f in $(git diff --name-only origin); do tools/sort-headers.py $f -f; done
    git commit -a -m headers
    # manually undo changes to gypi file
    git cl upload # patch set 1
2.)
    git grep -l 'scoped_nsobject<' | xargs sed -i -e 's/scoped_nsobject</base::scoped_nsobject</g'
    # manually undo comment changes in scoped_nsobject.h, tracking_area.h
    git commit -a -m format
    git cl upload # patch set 2
    # Manually audit all files, file bugs and clean up bad clang-format decisions
    git cl upload # patch set 3
BUG=251957
TBR=mark@chromium.org

Review URL: https://codereview.chromium.org/17593006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208283 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/crypto/apple_keychain_ios.mm b/crypto/apple_keychain_ios.mm
index c0b1048..74cf129 100644
--- a/crypto/apple_keychain_ios.mm
+++ b/crypto/apple_keychain_ios.mm
@@ -8,7 +8,7 @@
 
 #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 {
 
@@ -32,7 +32,7 @@ CFDictionaryRef CreateGenericPasswordQuery(UInt32 serviceNameLength,
   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]);
@@ -40,7 +40,7 @@ CFDictionaryRef CreateGenericPasswordQuery(UInt32 serviceNameLength,
                        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]);
@@ -86,7 +86,7 @@ CFDictionaryRef CreateKeychainData(UInt32 serviceNameLength,
                        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]);
@@ -94,7 +94,7 @@ CFDictionaryRef CreateKeychainData(UInt32 serviceNameLength,
                        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]);