chrome/browser/ui/cocoa/infobars/confirm_infobar_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/infobars/confirm_infobar_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/infobars/before_translate_infobar_controller.h ('k') | chrome/browser/ui/cocoa/infobars/extension_infobar_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/infobars/confirm_infobar_controller_unittest.mm

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

index af29dee248ec1762b4e0a044ada994ef4db3c7e5..2ef14045d11ac90580994cacee2fcaa4e418734a 100644

--- a/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm

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

#import "chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.h"

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

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

#include "base/strings/string_util.h"

#include "base/strings/sys_string_conversions.h"

#include "chrome/browser/infobars/confirm_infobar_delegate.h"

@@ -110,8 +110,8 @@ class ConfirmInfoBarControllerTest : public CocoaProfileTest,

bool delegate_closed() const { return delegate_ == NULL; }

MockConfirmInfoBarDelegate* delegate_; // Owns itself.

- scoped_nsobject<id> container_;

- scoped_nsobject<ConfirmInfoBarController> controller_;

+ base::scoped_nsobject<id> container_;

+ base::scoped_nsobject<ConfirmInfoBarController> controller_;

bool closed_delegate_ok_clicked_;

bool closed_delegate_cancel_clicked_;

bool closed_delegate_link_clicked_;