chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm - Issue 17593006: mac: Update clients of scoped_nsobject.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanups 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

« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm » ('j') | chrome/common/mac/objc_method_swizzle.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm

index d1d100526163aa616688c2b74e8107d1edd86128..9fb9b525269aaa9d68c9da83919b70eebb15a168 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm

@@ -12,7 +12,7 @@ class BookmarkBarFolderWindowTest : public CocoaTest {

};

TEST_F(BookmarkBarFolderWindowTest, Borderless) {

- scoped_nsobject<BookmarkBarFolderWindow> window_;

+ base::scoped_nsobject<BookmarkBarFolderWindow> window_;

window_.reset([[BookmarkBarFolderWindow alloc]

initWithContentRect:NSMakeRect(0,0,20,20)

styleMask:0

@@ -29,8 +29,8 @@ class BookmarkBarFolderWindowContentViewTest : public CocoaTest {

initWithFrame:NSMakeRect(0, 0, 100, 100)]);

[[test_window() contentView] addSubview:view_.get()];

}

- scoped_nsobject<BookmarkBarFolderWindowContentView> view_;

- scoped_nsobject<BookmarkBarFolderWindowScrollView> scroll_view_;

+ base::scoped_nsobject<BookmarkBarFolderWindowContentView> view_;

+ base::scoped_nsobject<BookmarkBarFolderWindowScrollView> scroll_view_;

};

TEST_VIEW(BookmarkBarFolderWindowContentViewTest, view_);

@@ -43,7 +43,7 @@ class BookmarkBarFolderWindowScrollViewTest : public CocoaTest {

initWithFrame:NSMakeRect(0, 0, 100, 100)]);

[[test_window() contentView] addSubview:scroll_view_.get()];

}

- scoped_nsobject<BookmarkBarFolderWindowScrollView> scroll_view_;

+ base::scoped_nsobject<BookmarkBarFolderWindowScrollView> scroll_view_;

};

TEST_VIEW(BookmarkBarFolderWindowScrollViewTest, scroll_view_);