ui/app_list/cocoa/apps_grid_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: ui/app_list/cocoa/apps_grid_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

« content/browser/renderer_host/webmenurunner_mac.mm ('K') | « ui/app_list/cocoa/apps_grid_controller.mm ('k') | ui/app_list/cocoa/apps_grid_view_item.mm » ('j') | ui/base/cocoa/menu_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/app_list/cocoa/apps_grid_controller_unittest.mm

diff --git a/ui/app_list/cocoa/apps_grid_controller_unittest.mm b/ui/app_list/cocoa/apps_grid_controller_unittest.mm

index 426a3906eb9c2d593debdaab1f13d045ac785fb0..7e31cdc86ccc258a1eed855d01eb9298d8541d79 100644

--- a/ui/app_list/cocoa/apps_grid_controller_unittest.mm

+++ b/ui/app_list/cocoa/apps_grid_controller_unittest.mm

@@ -3,7 +3,7 @@

// found in the LICENSE file.

#include "base/mac/foundation_util.h"

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

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

#include "base/strings/utf_string_conversions.h"

#include "skia/ext/skia_utils_mac.h"

#import "testing/gtest_mac.h"

@@ -114,7 +114,7 @@ class AppsGridControllerTest : public AppsGridControllerTestHelper {

}

private:

- scoped_nsobject<AppsGridController> owned_apps_grid_controller_;

+ base::scoped_nsobject<AppsGridController> owned_apps_grid_controller_;

scoped_ptr<AppListTestViewDelegate> owned_delegate_;

DISALLOW_COPY_AND_ASSIGN(AppsGridControllerTest);

@@ -502,7 +502,7 @@ TEST_F(AppsGridControllerTest, MouseoverSelects) {

// Test AppsGridPaginationObserver totalPagesChanged().

TEST_F(AppsGridControllerTest, PaginationObserverPagesChanged) {

- scoped_nsobject<TestPaginationObserver> observer(

+ base::scoped_nsobject<TestPaginationObserver> observer(

[[TestPaginationObserver alloc] init]);

[apps_grid_controller_ setPaginationObserver:observer];

@@ -528,7 +528,7 @@ TEST_F(AppsGridControllerTest, PaginationObserverPagesChanged) {

// Test AppsGridPaginationObserver selectedPageChanged().

TEST_F(AppsGridControllerTest, PaginationObserverSelectedPageChanged) {

- scoped_nsobject<TestPaginationObserver> observer(

+ base::scoped_nsobject<TestPaginationObserver> observer(

[[TestPaginationObserver alloc] init]);

[apps_grid_controller_ setPaginationObserver:observer];

EXPECT_EQ(0, [[NSAnimationContext currentContext] duration]);

@@ -749,7 +749,7 @@ TEST_F(AppsGridControllerTest, DragAndDropMultiPage) {

// Test scrolling when dragging past edge or over the pager.

TEST_F(AppsGridControllerTest, ScrollingWhileDragging) {

- scoped_nsobject<TestPaginationObserver> observer(

+ base::scoped_nsobject<TestPaginationObserver> observer(

[[TestPaginationObserver alloc] init]);

[apps_grid_controller_ setPaginationObserver:observer];