chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_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/browser/avatar_menu_bubble_controller_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/browser/avatar_menu_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm » ('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/browser/avatar_menu_bubble_controller_unittest.mm

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

index a25296964df783d4201f73d9e54627f9288ac21a..153efc4e28d501dff1db13f8be5b8c9334c0b937 100644

--- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm

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

#import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h"

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

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

#include "base/message_loop/message_pump_mac.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/prefs/pref_service_syncable.h"

@@ -116,7 +116,7 @@ TEST_F(AvatarMenuBubbleControllerTest, PerformLayout) {

NSView* contents = [[controller() window] contentView];

EXPECT_EQ(4U, [[contents subviews] count]);

- scoped_nsobject<NSMutableArray> oldItems([[controller() items] copy]);

+ base::scoped_nsobject<NSMutableArray> oldItems([[controller() items] copy]);

// Now create a new profile and notify the delegate.

manager()->CreateTestingProfile("test3", scoped_ptr<PrefServiceSyncable>(),

@@ -180,7 +180,7 @@ TEST_F(AvatarMenuBubbleControllerTest, PerformLayout) {

@end

TEST_F(AvatarMenuBubbleControllerTest, HighlightForEventType) {

- scoped_nsobject<TestingAvatarMenuItemController> item(

+ base::scoped_nsobject<TestingAvatarMenuItemController> item(

[[TestingAvatarMenuItemController alloc] initWithModelIndex:0

menuController:nil]);

// Test non-active states first.