mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_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/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
@@ skipping 110 matching lines @@
         bookmark_model->AddURL(bookmark_model->bookmark_bar_node(),
                                0,
                                ASCIIToUTF16("Test Bookmark"),
                                GURL("http://www.exmaple.com"));
 
     id mock_button = [OCMockObject mockForClass:[BookmarkButton class]];
     [[[mock_button stub] andReturnValue:OCMOCK_VALUE(node)] bookmarkNode];
     return [mock_button retain];
   }
 
-  scoped_nsobject<id> mock_controller_;
-  scoped_nsobject<BookmarkBarFolderView> view_;
-  scoped_nsobject<id> mock_button_;
+  base::scoped_nsobject<id> mock_controller_;
+  base::scoped_nsobject<BookmarkBarFolderView> view_;
+  base::scoped_nsobject<id> mock_button_;
 };
 
 TEST_F(BookmarkBarFolderViewTest, BookmarkButtonDragAndDrop) {
   id drag_info = GetFakeDragInfoForType(kBookmarkButtonDragType);
   [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
    draggingEntered:drag_info];
   [[[mock_controller_ expect] andReturnBool:NO] dragBookmarkData:drag_info];
   [[[mock_controller_ expect] andReturnBool:YES] dragButton:OCMOCK_ANY
                                                          to:kPoint
                                                        copy:NO];
@@ skipping 53 matching lines @@
   mock_controller_.reset(GetMockController(
       NO, BookmarkModelFactory::GetForProfile(profile())));
   [view_ setController:mock_controller_];
   [[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]
    draggingEntered:drag_info];
   EXPECT_EQ([view_ draggingEntered:drag_info], NSDragOperationMove);
   EXPECT_FALSE([view_ dropIndicatorShown]);
 }
 
 }  // namespace