chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_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/bookmarks/bookmark_bar_folder_view_unittest.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanups 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_bridge_unittest.mm ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h » ('j') | chrome/common/mac/objc_method_swizzle.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm

index 0550eab2e72a3402003667aadac9b4e4350a2245..b48b86a6f282bd7c6866b0ba6d474b3b5de4adea 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_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/string16.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/bookmarks/bookmark_model.h"

@@ -133,9 +133,9 @@ class BookmarkBarFolderViewTest : public CocoaProfileTest {

return [mock_button retain];

}

- scoped_nsobject<id> mock_controller_;

- scoped_nsobject<BookmarkBarFolderView> view_;

- scoped_nsobject<id> mock_button_;

+ base::scoped_nsobject<id> mock_controller_;

+ base::scoped_nsobject<BookmarkBarFolderView> view_;

+ base::scoped_nsobject<id> mock_button_;

};

TEST_F(BookmarkBarFolderViewTest, BookmarkButtonDragAndDrop) {