chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_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_folder_target_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

« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2ca188d6001977c089f9a3db5fbf94e89c7e7098..c6019a94a5f182cfed2961fa2671a29f48252d76 100644

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

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

@@ -57,8 +57,8 @@ TEST_F(BookmarkFolderTargetTest, StartWithNothing) {

// Make sure we get an addNew

[[controller expect] addNewFolderControllerWithParentButton:sender];

- scoped_nsobject<BookmarkFolderTarget> target(

- [[BookmarkFolderTarget alloc] initWithController:controller]);

+ base::scoped_nsobject<BookmarkFolderTarget> target(

+ [[BookmarkFolderTarget alloc] initWithController:controller]);

[target openBookmarkFolderFromButton:sender];

EXPECT_OCMOCK_VERIFY(controller);

@@ -82,7 +82,7 @@ TEST_F(BookmarkFolderTargetTest, ReopenSameFolder) {

// any subfolders).

[[controller expect] closeBookmarkFolder:controller];

- scoped_nsobject<BookmarkFolderTarget> target(

+ base::scoped_nsobject<BookmarkFolderTarget> target(

[[BookmarkFolderTarget alloc] initWithController:controller]);

[target openBookmarkFolderFromButton:sender];

@@ -111,8 +111,8 @@ TEST_F(BookmarkFolderTargetTest, ReopenNotSame) {

// close and open.

[[controller expect] addNewFolderControllerWithParentButton:sender];

- scoped_nsobject<BookmarkFolderTarget> target(

- [[BookmarkFolderTarget alloc] initWithController:controller]);

+ base::scoped_nsobject<BookmarkFolderTarget> target(

+ [[BookmarkFolderTarget alloc] initWithController:controller]);

[target openBookmarkFolderFromButton:sender];

EXPECT_OCMOCK_VERIFY(controller);