Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3124)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_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/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell_unittest.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
index eb78e7af66f1d08297c431ee0235a0b6116db944..d8a023d2fc38792d1db540c0e44bb103b06a05eb 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
@@ -4,7 +4,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
@@ -23,12 +23,11 @@ TEST_F(BookmarkNameFolderControllerTest, AddNew) {
const BookmarkNode* parent = model->bookmark_bar_node();
EXPECT_EQ(0, parent->child_count());
- scoped_nsobject<BookmarkNameFolderController>
- controller([[BookmarkNameFolderController alloc]
- initWithParentWindow:test_window()
- profile:profile()
- parent:parent
- newIndex:0]);
+ base::scoped_nsobject<BookmarkNameFolderController> controller(
+ [[BookmarkNameFolderController alloc] initWithParentWindow:test_window()
+ profile:profile()
+ parent:parent
+ newIndex:0]);
[controller window]; // force nib load
// Do nothing.
@@ -59,12 +58,11 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) {
GURL("http://www.google.com"));
EXPECT_EQ(2, parent->child_count());
- scoped_nsobject<BookmarkNameFolderController>
- controller([[BookmarkNameFolderController alloc]
- initWithParentWindow:test_window()
- profile:profile()
- parent:parent
- newIndex:1]);
+ base::scoped_nsobject<BookmarkNameFolderController> controller(
+ [[BookmarkNameFolderController alloc] initWithParentWindow:test_window()
+ profile:profile()
+ parent:parent
+ newIndex:1]);
[controller window]; // force nib load
// Add a new folder.
@@ -83,12 +81,11 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewDefaultName) {
const BookmarkNode* parent = model->bookmark_bar_node();
EXPECT_EQ(0, parent->child_count());
- scoped_nsobject<BookmarkNameFolderController>
- controller([[BookmarkNameFolderController alloc]
- initWithParentWindow:test_window()
- profile:profile()
- parent:parent
- newIndex:0]);
+ base::scoped_nsobject<BookmarkNameFolderController> controller(
+ [[BookmarkNameFolderController alloc] initWithParentWindow:test_window()
+ profile:profile()
+ parent:parent
+ newIndex:0]);
[controller window]; // force nib load
@@ -104,12 +101,11 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewBlankName) {
const BookmarkNode* parent = model->bookmark_bar_node();
EXPECT_EQ(0, parent->child_count());
- scoped_nsobject<BookmarkNameFolderController>
- controller([[BookmarkNameFolderController alloc]
- initWithParentWindow:test_window()
- profile:profile()
- parent:parent
- newIndex:0]);
+ base::scoped_nsobject<BookmarkNameFolderController> controller(
+ [[BookmarkNameFolderController alloc] initWithParentWindow:test_window()
+ profile:profile()
+ parent:parent
+ newIndex:0]);
[controller window]; // force nib load
// Change the name to blank, click OK.
@@ -128,11 +124,10 @@ TEST_F(BookmarkNameFolderControllerTest, Rename) {
// Rename the folder by creating a controller that originates from
// the node.
- scoped_nsobject<BookmarkNameFolderController>
- controller([[BookmarkNameFolderController alloc]
- initWithParentWindow:test_window()
- profile:profile()
- node:folder]);
+ base::scoped_nsobject<BookmarkNameFolderController> controller(
+ [[BookmarkNameFolderController alloc] initWithParentWindow:test_window()
+ profile:profile()
+ node:folder]);
[controller window]; // force nib load
EXPECT_NSEQ(@"folder", [controller folderName]);
@@ -148,12 +143,11 @@ TEST_F(BookmarkNameFolderControllerTest, EditAndConfirmOKButton) {
const BookmarkNode* parent = model->bookmark_bar_node();
EXPECT_EQ(0, parent->child_count());
- scoped_nsobject<BookmarkNameFolderController>
- controller([[BookmarkNameFolderController alloc]
- initWithParentWindow:test_window()
- profile:profile()
- parent:parent
- newIndex:0]);
+ base::scoped_nsobject<BookmarkNameFolderController> controller(
+ [[BookmarkNameFolderController alloc] initWithParentWindow:test_window()
+ profile:profile()
+ parent:parent
+ newIndex:0]);
[controller window]; // force nib load
// We start enabled since the default "New Folder" is added for us.
« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell_unittest.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698