Index: chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm |
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm |
index 8b33d2a6fab85d8e0e38998fa4fcd00f22ac63cf..249ff566689aaff05640b0b8b7ad19b35649d840 100644 |
--- a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm |
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm |
@@ -4,9 +4,9 @@ |
#import <Cocoa/Cocoa.h> |
-#include "base/memory/scoped_nsobject.h" |
-#import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h" |
+#include "base/mac/scoped_nsobject.h" |
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h" |
+#import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "testing/platform_test.h" |
@@ -36,13 +36,13 @@ class FindBarTextFieldCellTest : public CocoaTest { |
// decorations. |
const NSRect frame = NSMakeRect(0, 0, kWidth, 30); |
- scoped_nsobject<FindBarTextFieldCell> cell( |
+ base::scoped_nsobject<FindBarTextFieldCell> cell( |
[[FindBarTextFieldCell alloc] initTextCell:@"Testing"]); |
cell_ = cell; |
[cell_ setEditable:YES]; |
[cell_ setBordered:YES]; |
- scoped_nsobject<NSTextField> view( |
+ base::scoped_nsobject<NSTextField> view( |
[[NSTextField alloc] initWithFrame:frame]); |
view_ = view; |
[view_ setCell:cell_]; |
@@ -81,12 +81,12 @@ TEST_F(FindBarTextFieldCellTest, FocusedDisplay) { |
// appropriately. |
TEST_F(FindBarTextFieldCellTest, SetAndClearFindResults) { |
[cell_ setActiveMatch:10 of:30]; |
- scoped_nsobject<NSAttributedString> tenString( |
+ base::scoped_nsobject<NSAttributedString> tenString( |
[[cell_ resultsAttributedString] copy]); |
EXPECT_GT([tenString length], 0U); |
[cell_ setActiveMatch:0 of:0]; |
- scoped_nsobject<NSAttributedString> zeroString( |
+ base::scoped_nsobject<NSAttributedString> zeroString( |
[[cell_ resultsAttributedString] copy]); |
EXPECT_GT([zeroString length], 0U); |
EXPECT_FALSE([tenString isEqualToAttributedString:zeroString]); |