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

Unified Diff: content/common/mac/attributed_string_coder_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: content/common/mac/attributed_string_coder_unittest.mm
diff --git a/content/common/mac/attributed_string_coder_unittest.mm b/content/common/mac/attributed_string_coder_unittest.mm
index 9555fc5d151bb6c6d5b458d2160f6a670e5110f4..a98c48ae893b105ecf1428af7185379f371f3522 100644
--- a/content/common/mac/attributed_string_coder_unittest.mm
+++ b/content/common/mac/attributed_string_coder_unittest.mm
@@ -4,7 +4,7 @@
#include <AppKit/AppKit.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
#import "content/common/mac/attributed_string_coder.h"
@@ -33,7 +33,7 @@ class AttributedStringCoderTest : public testing::Test {
};
TEST_F(AttributedStringCoderTest, SimpleString) {
- scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
+ base::scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
[attr_str addAttributes:FontAttribute(@"Helvetica", 12.5)
range:NSMakeRange(0, [attr_str length])];
@@ -42,13 +42,13 @@ TEST_F(AttributedStringCoderTest, SimpleString) {
}
TEST_F(AttributedStringCoderTest, NoAttributes) {
- scoped_nsobject<NSAttributedString> attr_str(NewAttrString());
+ base::scoped_nsobject<NSAttributedString> attr_str(NewAttrString());
NSAttributedString* decoded = EncodeAndDecode(attr_str.get());
EXPECT_NSEQ(attr_str.get(), decoded);
}
TEST_F(AttributedStringCoderTest, StripColor) {
- scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
+ base::scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
const NSUInteger kStringLength = [attr_str length];
[attr_str addAttribute:NSFontAttributeName
value:[NSFont systemFontOfSize:26]
@@ -68,7 +68,7 @@ TEST_F(AttributedStringCoderTest, StripColor) {
}
TEST_F(AttributedStringCoderTest, MultipleFonts) {
- scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
+ base::scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
[attr_str setAttributes:FontAttribute(@"Courier", 12)
range:NSMakeRange(0, 10)];
[attr_str addAttributes:FontAttribute(@"Helvetica", 16)
@@ -82,7 +82,7 @@ TEST_F(AttributedStringCoderTest, MultipleFonts) {
}
TEST_F(AttributedStringCoderTest, NoPertinentAttributes) {
- scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
+ base::scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
[attr_str addAttribute:NSForegroundColorAttributeName
value:[NSColor blueColor]
range:NSMakeRange(0, 10)];
@@ -95,7 +95,7 @@ TEST_F(AttributedStringCoderTest, NoPertinentAttributes) {
NSAttributedString* decoded = EncodeAndDecode(attr_str.get());
- scoped_nsobject<NSAttributedString> expected(NewAttrString());
+ base::scoped_nsobject<NSAttributedString> expected(NewAttrString());
EXPECT_NSEQ(expected.get(), decoded);
}

Powered by Google App Engine
This is Rietveld 408576698