Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm |
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm |
index a0f2ef97dd3381022e1090ebcaa6480cbf99fad1..0a9650d21240f61381b469f63c1331601d4a251e 100644 |
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm |
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm |
@@ -26,7 +26,7 @@ typedef std::pair<GURL,WindowOpenDisposition> OpenInfo; |
// Oddly, we are our own delegate. |
@interface FakeBookmarkBarController : BookmarkBarController { |
@public |
- scoped_nsobject<NSMutableArray> callbacks_; |
+ base::scoped_nsobject<NSMutableArray> callbacks_; |
std::vector<OpenInfo> opens_; |
} |
@end |
@@ -98,15 +98,15 @@ class BookmarkBarBridgeTest : public CocoaProfileTest { |
TEST_F(BookmarkBarBridgeTest, TestRedirect) { |
BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); |
- scoped_nsobject<NSView> parentView([[NSView alloc] |
- initWithFrame:NSMakeRect(0,0,100,100)]); |
- scoped_nsobject<NSView> webView([[NSView alloc] |
- initWithFrame:NSMakeRect(0,0,100,100)]); |
- scoped_nsobject<NSView> infoBarsView( |
- [[NSView alloc] initWithFrame:NSMakeRect(0,0,100,100)]); |
+ base::scoped_nsobject<NSView> parentView( |
+ [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]); |
+ base::scoped_nsobject<NSView> webView( |
+ [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]); |
+ base::scoped_nsobject<NSView> infoBarsView( |
+ [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]); |
- scoped_nsobject<FakeBookmarkBarController> |
- controller([[FakeBookmarkBarController alloc] initWithBrowser:browser()]); |
+ base::scoped_nsobject<FakeBookmarkBarController> controller( |
+ [[FakeBookmarkBarController alloc] initWithBrowser:browser()]); |
EXPECT_TRUE(controller.get()); |
scoped_ptr<BookmarkBarBridge> bridge(new BookmarkBarBridge(profile(), |
controller.get(), |