crypto/apple_keychain_ios.mm - Issue 17593006: mac: Update clients of scoped_nsobject.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: crypto/apple_keychain_ios.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanups Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/clipboard_message_filter_mac.mm ('K') | « content/shell/shell_mac.mm ('k') | net/base/platform_mime_util_mac.mm » ('j') | net/base/platform_mime_util_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: crypto/apple_keychain_ios.mm

diff --git a/crypto/apple_keychain_ios.mm b/crypto/apple_keychain_ios.mm

index c0b104868a20f2c28b816ac174d39fee38a717e5..74cf129ce1fd02790f390f051347bb1d60d192d9 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]);