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

Unified Diff: chrome/browser/ui/cocoa/autofill/layout_view_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/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]));
-}
+}

Powered by Google App Engine
This is Rietveld 408576698