Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7726)

Unified Diff: chrome/common/mac/nscoder_util_unittest.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol 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
Index: chrome/common/mac/nscoder_util_unittest.mm
diff --git a/chrome/common/mac/nscoder_util_unittest.mm b/chrome/common/mac/nscoder_util_unittest.mm
index 204ebd79ee78bf918ac78713c979838603b8f0cc..ed84a94e75fa250e01c878fcf6347a0179ff156c 100644
--- a/chrome/common/mac/nscoder_util_unittest.mm
+++ b/chrome/common/mac/nscoder_util_unittest.mm
@@ -5,7 +5,7 @@
#import <Foundation/Foundation.h>
#include "base/basictypes.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "chrome/common/mac/nscoder_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
@@ -27,12 +27,12 @@ TEST_F(NSCoderStdStringTest, encodeDecode) {
for (size_t i = 0; i < arraysize(testStrings); ++i) {
NSMutableData *data = [NSMutableData data];
- scoped_nsobject<NSKeyedArchiver> archiver(
+ base::scoped_nsobject<NSKeyedArchiver> archiver(
[[NSKeyedArchiver alloc] initForWritingWithMutableData:data]);
nscoder_util::EncodeString(archiver, @"test", testStrings[i]);
[archiver finishEncoding];
- scoped_nsobject<NSKeyedUnarchiver> unarchiver(
+ base::scoped_nsobject<NSKeyedUnarchiver> unarchiver(
[[NSKeyedUnarchiver alloc] initForReadingWithData:data]);
const std::string decoded = nscoder_util::DecodeString(unarchiver, @"test");
@@ -43,11 +43,11 @@ TEST_F(NSCoderStdStringTest, encodeDecode) {
TEST_F(NSCoderStdStringTest, decodeEmpty) {
NSMutableData *data = [NSMutableData data];
- scoped_nsobject<NSKeyedArchiver> archiver(
+ base::scoped_nsobject<NSKeyedArchiver> archiver(
[[NSKeyedArchiver alloc] initForWritingWithMutableData:data]);
[archiver finishEncoding];
- scoped_nsobject<NSKeyedUnarchiver> unarchiver(
+ base::scoped_nsobject<NSKeyedUnarchiver> unarchiver(
[[NSKeyedUnarchiver alloc] initForReadingWithData:data]);
const std::string decoded = nscoder_util::DecodeString(unarchiver, @"test");

Powered by Google App Engine
This is Rietveld 408576698