content/browser/renderer_host/render_widget_host_view_mac_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: content/browser/renderer_host/render_widget_host_view_mac_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

« content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm ('K') | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | content/browser/renderer_host/text_input_client_mac.h » ('j') | content/browser/renderer_host/webmenurunner_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

index 99748c6f3b6f889a2962ac031a365fc26e25f6ee..72cf00f56e0395a8b549f66d775adbf75058d8ba 100644

--- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

+++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

@@ -203,7 +203,7 @@ class RenderWidgetHostViewMacTest : public RenderViewHostImplTestHarness {

protected:

RenderWidgetHostViewMac* rwhv_mac_;

- scoped_nsobject<RenderWidgetHostViewCocoa> rwhv_cocoa_;

+ base::scoped_nsobject<RenderWidgetHostViewCocoa> rwhv_cocoa_;

private:

DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMacTest);

@@ -226,8 +226,8 @@ TEST_F(RenderWidgetHostViewMacTest, AcceptsFirstResponder) {

}

TEST_F(RenderWidgetHostViewMacTest, TakesFocusOnMouseDown) {

- scoped_nsobject<CocoaTestHelperWindow>

- window([[CocoaTestHelperWindow alloc] init]);

+ base::scoped_nsobject<CocoaTestHelperWindow> window(

+ [[CocoaTestHelperWindow alloc] init]);

[[window contentView] addSubview:rwhv_cocoa_.get()];

// Even if the RWHVCocoa disallows first responder, clicking on it gives it

@@ -658,8 +658,8 @@ TEST_F(RenderWidgetHostViewMacTest, BlurAndFocusOnSetActive) {

RenderWidgetHostViewMac* view = static_cast<RenderWidgetHostViewMac*>(

RenderWidgetHostView::CreateViewForWidget(rwh));

- scoped_nsobject<CocoaTestHelperWindow>

- window([[CocoaTestHelperWindow alloc] init]);

+ base::scoped_nsobject<CocoaTestHelperWindow> window(

+ [[CocoaTestHelperWindow alloc] init]);

[[window contentView] addSubview:view->cocoa_view()];

EXPECT_CALL(*rwh, Focus());

@@ -744,8 +744,8 @@ TEST_F(RenderWidgetHostViewMacTest, IgnoreEmptyUnhandledWheelEvent) {

RenderWidgetHostView::CreateViewForWidget(host));

// Add a delegate to the view.

- scoped_nsobject<MockRenderWidgetHostViewMacDelegate> view_delegate(

- [[MockRenderWidgetHostViewMacDelegate alloc] init]);

+ base::scoped_nsobject<MockRenderWidgetHostViewMacDelegate> view_delegate(

+ [[MockRenderWidgetHostViewMacDelegate alloc] init]);

view->SetDelegate(view_delegate.get());

// Send an initial wheel event for scrolling by 3 lines.