chrome/browser/ui/cocoa/content_settings/cookie_details_view_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/content_settings/cookie_details_view_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/content_settings/cookie_details_unittest.mm ('k') | chrome/browser/ui/cocoa/content_settings/cookie_tree_node.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/content_settings/cookie_details_view_controller_unittest.mm

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

index 29a08060aa7ca46ec66350177c12bbc587d35b4d..c901c71923261e3981cd7d65f75b4468fdab20c3 100644

--- a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm

@@ -52,14 +52,14 @@ static CookiePromptContentDetailsAdapter* CreateDatabaseTestContent() {

}

TEST_F(CookieDetailsViewControllerTest, Create) {

- scoped_nsobject<CookieDetailsViewController> detailsViewController(

+ base::scoped_nsobject<CookieDetailsViewController> detailsViewController(

[[CookieDetailsViewController alloc] init]);

}

TEST_F(CookieDetailsViewControllerTest, ShrinkToFit) {

- scoped_nsobject<CookieDetailsViewController> detailsViewController(

+ base::scoped_nsobject<CookieDetailsViewController> detailsViewController(

[[CookieDetailsViewController alloc] init]);

- scoped_nsobject<CookiePromptContentDetailsAdapter> adapter(

+ base::scoped_nsobject<CookiePromptContentDetailsAdapter> adapter(

[CreateDatabaseTestContent() retain]);

[detailsViewController.get() setContentObject:adapter.get()];

NSRect beforeFrame = [[detailsViewController.get() view] frame];

@@ -70,10 +70,10 @@ TEST_F(CookieDetailsViewControllerTest, ShrinkToFit) {

}

TEST_F(CookieDetailsViewControllerTest, ExpirationEditability) {

- scoped_nsobject<CookieDetailsViewController> detailsViewController(

+ base::scoped_nsobject<CookieDetailsViewController> detailsViewController(

[[CookieDetailsViewController alloc] init]);

[detailsViewController view];

- scoped_nsobject<CookiePromptContentDetailsAdapter> adapter(

+ base::scoped_nsobject<CookiePromptContentDetailsAdapter> adapter(

[CreateCookieTestContent(YES) retain]);

[detailsViewController.get() setContentObject:adapter.get()];