Index: chrome/browser/ui/cocoa/autofill/layout_view_unittest.mm |
diff --git a/chrome/browser/ui/cocoa/autofill/layout_view_unittest.mm b/chrome/browser/ui/cocoa/autofill/layout_view_unittest.mm |
index abfcd2279bcace103dcf6ac5607def0e4c72c381..c56c9f8f2ccb5e3423c21da49c6b2b0ae232648a 100644 |
--- a/chrome/browser/ui/cocoa/autofill/layout_view_unittest.mm |
+++ b/chrome/browser/ui/cocoa/autofill/layout_view_unittest.mm |
@@ -4,7 +4,7 @@ |
#import "chrome/browser/ui/cocoa/autofill/layout_view.h" |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "chrome/browser/ui/cocoa/autofill/simple_grid_layout.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "testing/platform_test.h" |
@@ -24,7 +24,7 @@ class LayoutViewTest : public ui::CocoaTest { |
} |
protected: |
- scoped_nsobject<LayoutView> view_; |
+ base::scoped_nsobject<LayoutView> view_; |
SimpleGridLayout* layout_; // weak, owned by view_. |
}; |
@@ -40,9 +40,9 @@ TEST_F(LayoutViewTest, setFrameInvokesLayout) { |
cs->AddColumn(0.4); |
cs->AddColumn(0.6); |
layout_->StartRow(0, 0); |
- scoped_nsobject<NSView> childView1( |
+ base::scoped_nsobject<NSView> childView1( |
[[NSView alloc] initWithFrame:NSMakeRect(0, 0, 0, 45)]); |
- scoped_nsobject<NSView> childView2( |
+ base::scoped_nsobject<NSView> childView2( |
[[NSView alloc] initWithFrame:NSMakeRect(0, 0, 20, 55)]); |
layout_->AddView(childView1); |
layout_->AddView(childView2); |
@@ -62,4 +62,4 @@ TEST_F(LayoutViewTest, setFrameInvokesLayout) { |
subview = [[view_ subviews] objectAtIndex:1]; |
EXPECT_FLOAT_EQ(24, NSWidth([subview frame])); |
EXPECT_FLOAT_EQ(55, NSHeight([subview frame])); |
-} |
+} |