mac: Update clients of scoped_nsobject.h.

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm
index 6e0b5d32b7e3214f29ed907aa058fad729f066b2..a6cb9d2409275f4f3f1888bddee77c6240f29f77 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_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/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ -65,14 +65,14 @@ class BookmarkButtonTest : public CocoaProfileTest {
 
 // Make sure nothing leaks
 TEST_F(BookmarkButtonTest, Create) {
-  scoped_nsobject<BookmarkButton> button;
+  base::scoped_nsobject<BookmarkButton> button;
   button.reset([[BookmarkButton alloc] initWithFrame:NSMakeRect(0,0,500,500)]);
 }
 
 // Test folder and empty node queries.
 TEST_F(BookmarkButtonTest, FolderAndEmptyOrNot) {
-  scoped_nsobject<BookmarkButton> button;
-  scoped_nsobject<BookmarkButtonCell> cell;
+  base::scoped_nsobject<BookmarkButton> button;
+  base::scoped_nsobject<BookmarkButtonCell> cell;
 
   button.reset([[BookmarkButton alloc] initWithFrame:NSMakeRect(0,0,500,500)]);
   cell.reset([[BookmarkButtonCell alloc] initTextCell:@"hi mom"]);
@@ -107,10 +107,10 @@ TEST_F(BookmarkButtonTest, MouseEnterExitRedirect) {
       cocoa_test_event_utils::MouseEventAtPoint(NSMakePoint(10,10),
                                                 NSMouseMoved,
                                                 0);
-  scoped_nsobject<BookmarkButton> button;
-  scoped_nsobject<BookmarkButtonCell> cell;
-  scoped_nsobject<FakeButtonDelegate>
-      delegate([[FakeButtonDelegate alloc] init]);
+  base::scoped_nsobject<BookmarkButton> button;
+  base::scoped_nsobject<BookmarkButtonCell> cell;
+  base::scoped_nsobject<FakeButtonDelegate> delegate(
+      [[FakeButtonDelegate alloc] init]);
   button.reset([[BookmarkButton alloc] initWithFrame:NSMakeRect(0,0,500,500)]);
   cell.reset([[BookmarkButtonCell alloc] initTextCell:@"hi mom"]);
   [button setCell:cell];
@@ -130,10 +130,10 @@ TEST_F(BookmarkButtonTest, MouseEnterExitRedirect) {
 }
 
 TEST_F(BookmarkButtonTest, DragToTrash) {
-  scoped_nsobject<BookmarkButton> button;
-  scoped_nsobject<BookmarkButtonCell> cell;
-  scoped_nsobject<FakeButtonDelegate>
-      delegate([[FakeButtonDelegate alloc] init]);
+  base::scoped_nsobject<BookmarkButton> button;
+  base::scoped_nsobject<BookmarkButtonCell> cell;
+  base::scoped_nsobject<FakeButtonDelegate> delegate(
+      [[FakeButtonDelegate alloc] init]);
   button.reset([[BookmarkButton alloc] initWithFrame:NSMakeRect(0,0,500,500)]);
   cell.reset([[BookmarkButtonCell alloc] initTextCell:@"hi mom"]);
   [button setCell:cell];