chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_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_toolbar_view_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_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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_toolbar_view_unittest.mm

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

index e82089701abbf409c3867521c81c766b22f9af75..f7a984be6850b9927e6219d893b090cfda1955cf 100644

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

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

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

#import <Cocoa/Cocoa.h>

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

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

#include "chrome/browser/themes/theme_properties.h"

#include "chrome/browser/themes/theme_service.h"

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

@@ -94,14 +94,14 @@ class BookmarkBarToolbarViewTest : public CocoaTest {

BookmarkBarToolbarViewTest() {

controller_.reset([[DrawDetachedBarFakeController alloc] init]);

NSRect frame = NSMakeRect(0, 0, 400, 40);

- scoped_nsobject<BookmarkBarToolbarView> view(

+ base::scoped_nsobject<BookmarkBarToolbarView> view(

[[BookmarkBarToolbarView alloc] initWithFrame:frame]);

view_ = view.get();

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

[view_ setController:controller_.get()];

}

- scoped_nsobject<DrawDetachedBarFakeController> controller_;

+ base::scoped_nsobject<DrawDetachedBarFakeController> controller_;

BookmarkBarToolbarView* view_;

};