chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_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/wrench_menu/menu_tracked_root_view_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/location_bar/autocomplete_text_field_cell.mm ('K') | « chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm ('k') | chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h » ('j') | content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm

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

index 76da79c161298dc764434596c8bb9a60dff0305a..14266b667375b9e68dccb2b6237c38c6e21b3f73 100644

--- a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm

+++ b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm

@@ -4,13 +4,13 @@

#import <Cocoa/Cocoa.h>

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

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

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

#import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "testing/platform_test.h"

-#include "third_party/ocmock/gtest_support.h"

#import "third_party/ocmock/OCMock/OCMock.h"

+#include "third_party/ocmock/gtest_support.h"

class MenuTrackedRootViewTest : public CocoaTest {

public:

@@ -19,7 +19,7 @@ class MenuTrackedRootViewTest : public CocoaTest {

view_.reset([[MenuTrackedRootView alloc] init]);

}

- scoped_nsobject<MenuTrackedRootView> view_;

+ base::scoped_nsobject<MenuTrackedRootView> view_;

};

TEST_F(MenuTrackedRootViewTest, MouseUp) {