chrome/browser/ui/cocoa/wrench_menu/wrench_menu_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/wrench_menu/wrench_menu_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/location_bar/autocomplete_text_field_cell.mm ('K') | « chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm ('k') | chrome/browser/ui/tests/ui_gfx_image_unittest.mm » ('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/wrench_menu_controller_unittest.mm

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

index 0d08c3cc07b247521f64e7baf35f8c64f7fa407e..d681db0ac3c9e93520435dc90f1316b3b39fa510 100644

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

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

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

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

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

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

@@ -62,7 +62,7 @@ class WrenchMenuControllerTest : public CocoaProfileTest {

return controller_.get();

}

- scoped_nsobject<WrenchMenuController> controller_;

+ base::scoped_nsobject<WrenchMenuController> controller_;

scoped_ptr<MockWrenchMenuModel> fake_model_;

};

@@ -73,7 +73,7 @@ TEST_F(WrenchMenuControllerTest, Initialized) {

}

TEST_F(WrenchMenuControllerTest, DispatchSimple) {

- scoped_nsobject<NSButton> button([[NSButton alloc] init]);

+ base::scoped_nsobject<NSButton> button([[NSButton alloc] init]);

[button setTag:IDC_ZOOM_PLUS];

// Set fake model to test dispatching.