mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 class BookmarkNameFolderControllerTest : public CocoaProfileTest {
 };
 
 
 // Simple add of a node (at the end).
 TEST_F(BookmarkNameFolderControllerTest, AddNew) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   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.
   [controller cancel:nil];
   EXPECT_EQ(0, parent->child_count());
 
   // Change name then cancel.
   [controller setFolderName:@"Bozo"];
   [controller cancel:nil];
   EXPECT_EQ(0, parent->child_count());
@@ skipping 10 matching lines @@
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* parent = model->bookmark_bar_node();
 
   // Add 2 nodes.  We will place the new folder in the middle of these.
   model->AddURL(parent, 0, ASCIIToUTF16("title 1"),
                 GURL("http://www.google.com"));
   model->AddURL(parent, 1, ASCIIToUTF16("title 3"),
                 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.
   [controller setFolderName:@"middle"];
   [controller ok:nil];
 
   // Confirm we now have 3, and that the new one is in the middle.
   EXPECT_EQ(3, parent->child_count());
   EXPECT_TRUE(parent->GetChild(1)->is_folder());
   EXPECT_EQ(ASCIIToUTF16("middle"), parent->GetChild(1)->GetTitle());
 }
 
 // Make sure we are allowed to create a folder named "New Folder".
 TEST_F(BookmarkNameFolderControllerTest, AddNewDefaultName) {
  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   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
 
   // Click OK without changing the name
   [controller ok:nil];
   EXPECT_EQ(1, parent->child_count());
   EXPECT_TRUE(parent->GetChild(0)->is_folder());
 }
 
 // Make sure we are allowed to create a folder with an empty name.
 TEST_F(BookmarkNameFolderControllerTest, AddNewBlankName) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   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.
   [controller setFolderName:@""];
   [controller ok:nil];
   EXPECT_EQ(1, parent->child_count());
   EXPECT_TRUE(parent->GetChild(0)->is_folder());
 }
 
 TEST_F(BookmarkNameFolderControllerTest, Rename) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(parent,
                                                 parent->child_count(),
                                                 ASCIIToUTF16("folder"));
 
   // 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]);
   [controller setFolderName:@"Zobo"];
   [controller ok:nil];
   EXPECT_EQ(1, parent->child_count());
   EXPECT_TRUE(parent->GetChild(0)->is_folder());
   EXPECT_EQ(ASCIIToUTF16("Zobo"), parent->GetChild(0)->GetTitle());
 }
 
 TEST_F(BookmarkNameFolderControllerTest, EditAndConfirmOKButton) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   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.
   EXPECT_TRUE([[controller okButton] isEnabled]);
 
   [controller setFolderName:@"Bozo"];
   EXPECT_TRUE([[controller okButton] isEnabled]);
   [controller setFolderName:@" "];
   EXPECT_TRUE([[controller okButton] isEnabled]);
 
   [controller setFolderName:@""];
   EXPECT_TRUE([[controller okButton] isEnabled]);
 }