mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_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"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 class BookmarkBarFolderButtonCellTest : public CocoaTest {
 };
 
 // Basic creation.
 TEST_F(BookmarkBarFolderButtonCellTest, Create) {
-  scoped_nsobject<BookmarkBarFolderButtonCell> cell;
+  base::scoped_nsobject<BookmarkBarFolderButtonCell> cell;
   cell.reset([[BookmarkBarFolderButtonCell buttonCellForNode:nil
                                                         text:nil
                                                        image:nil
                                               menuController:nil] retain]);
   EXPECT_TRUE(cell);
 }
 
 TEST_F(BookmarkBarFolderButtonCellTest, FaviconPositioning) {
   NSRect frame = NSMakeRect(0, 0, 50, 30);
-  scoped_nsobject<NSButton> view([[NSButton alloc] initWithFrame:frame]);
-  scoped_nsobject<NSButton> folder_view(
+  base::scoped_nsobject<NSButton> view([[NSButton alloc] initWithFrame:frame]);
+  base::scoped_nsobject<NSButton> folder_view(
       [[NSButton alloc] initWithFrame:frame]);
 
   ASSERT_TRUE(view.get());
   ASSERT_TRUE(folder_view.get());
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  scoped_nsobject<NSImage> image(
+  base::scoped_nsobject<NSImage> image(
       rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).CopyNSImage());
   ASSERT_TRUE(image.get());
 
-  scoped_nsobject<BookmarkButtonCell> cell(
+  base::scoped_nsobject<BookmarkButtonCell> cell(
       [[BookmarkButtonCell alloc] initTextCell:@"Testing"]);
-  scoped_nsobject<BookmarkBarFolderButtonCell> folder_cell(
+  base::scoped_nsobject<BookmarkBarFolderButtonCell> folder_cell(
       [[BookmarkBarFolderButtonCell buttonCellForNode:nil
                                                  text:@"Testing"
                                                 image:image
                                        menuController:nil] retain]);
 
   ASSERT_TRUE(cell.get());
   ASSERT_TRUE(folder_cell.get());
 
   [view setCell:cell.get()];
   [folder_view setCell:folder_cell.get()];
@@ skipping 20 matching lines @@
 
   [folder_cell setBookmarkCellText:@"test" image:image];
   float folder_cell_x_with_title = ([cell imageRectForBounds:rect]).origin.x;
   float folder_cell_width_with_title = ([cell cellSize]).width;
 
   EXPECT_EQ(folder_cell_x_without_title, folder_cell_x_with_title);
   EXPECT_EQ(folder_cell_width_without_title, folder_cell_width_with_title);
 }
 
 } // namespace