chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell_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_tree_browser_cell_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_name_folder_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/browser/avatar_button_controller.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_tree_browser_cell_unittest.mm

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

index 60f6deb17e0aecb642106bbe7688d6d05dbfd18e..7450904724e85b6a742482b454c0ea98ad9bdb7f 100644

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

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

@@ -4,7 +4,7 @@

#import <Cocoa/Cocoa.h>

-#import "base/memory/scoped_nsobject.h"

+#import "base/mac/scoped_nsobject.h"

#include "chrome/browser/bookmarks/bookmark_model.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h"

#include "testing/platform_test.h"

@@ -20,8 +20,8 @@ class BookmarkTreeBrowserCellTest : public PlatformTest {

}

scoped_ptr<BookmarkNode> bookmarkNodeMock_;

- scoped_nsobject<NSMatrix> matrixMock_;

- scoped_nsobject<NSObject> targetMock_;

+ base::scoped_nsobject<NSMatrix> matrixMock_;

+ base::scoped_nsobject<NSObject> targetMock_;

};

TEST_F(BookmarkTreeBrowserCellTest, BasicAllocDealloc) {