mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/bookmarks/bookmark_button_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.
 
-#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"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #import "ui/base/test/cocoa_test_event_utils.h"
 
@@ skipping 42 matching lines @@
 }
 @end
 
 namespace {
 
 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"]);
   [button setCell:cell];
 
   EXPECT_TRUE([button isEmpty]);
   EXPECT_FALSE([button isFolder]);
   EXPECT_FALSE([button bookmarkNode]);
 
   NSEvent* downEvent =
@@ skipping 14 matching lines @@
   EXPECT_FALSE([button isEmpty]);
   EXPECT_FALSE([button isFolder]);
   EXPECT_EQ([button bookmarkNode], node);
 }
 
 TEST_F(BookmarkButtonTest, MouseEnterExitRedirect) {
   NSEvent* moveEvent =
       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];
   [button setDelegate:delegate];
 
   EXPECT_EQ(0, delegate.get()->entered_);
   EXPECT_EQ(0, delegate.get()->exited_);
 
   [button mouseEntered:moveEvent];
   EXPECT_EQ(1, delegate.get()->entered_);
   EXPECT_EQ(0, delegate.get()->exited_);
 
   [button mouseExited:moveEvent];
   [button mouseExited:moveEvent];
   EXPECT_EQ(1, delegate.get()->entered_);
   EXPECT_EQ(2, delegate.get()->exited_);
 }
 
 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];
   [button setDelegate:delegate];
 
   // Add a deletable bookmark to the button.
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* barNode = model->bookmark_bar_node();
   const BookmarkNode* node = model->AddURL(barNode, 0, ASCIIToUTF16("hi mom"),
                                            GURL("http://www.google.com"));
@@ skipping 20 matching lines @@
   EXPECT_EQ(0, delegate.get()->didDragToTrashCount_);
   [button draggedImage:nil endedAt:NSZeroPoint operation:NSDragOperationCopy];
   EXPECT_EQ(0, delegate.get()->didDragToTrashCount_);
   [button draggedImage:nil endedAt:NSZeroPoint operation:NSDragOperationMove];
   EXPECT_EQ(0, delegate.get()->didDragToTrashCount_);
   [button draggedImage:nil endedAt:NSZeroPoint operation:NSDragOperationDelete];
   EXPECT_EQ(1, delegate.get()->didDragToTrashCount_);
 }
 
 }