mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_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 "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 @interface FakeBookmarkMenuController : BookmarkMenuCocoaController {
@@ skipping 53 matching lines @@
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
     controller_.reset(
         [[FakeBookmarkMenuController alloc] initWithProfile:profile()]);
   }
 
   FakeBookmarkMenuController* controller() { return controller_.get(); }
 
  private:
-  scoped_nsobject<FakeBookmarkMenuController> controller_;
+  base::scoped_nsobject<FakeBookmarkMenuController> controller_;
 };
 
 TEST_F(BookmarkMenuCocoaControllerTest, TestOpenItem) {
   FakeBookmarkMenuController* c = controller();
   NSMenuItem *item = [[[NSMenuItem alloc] init] autorelease];
   for (int i = 0; i < 2; i++) {
     [item setTag:i];
     ASSERT_EQ(c->opened_[i], NO);
     [c openBookmarkMenuItem:item];
     ASSERT_NE(c->opened_[i], NO);
   }
 
   // Test three versions of 'Open All Bookmarks' item. tag id means nothing.
   // I just reset the tag id to zero.
   [item setTag:0];
   EXPECT_EQ(c->opened_new_foreground_tab, NO);
   [c openAllBookmarks:item];
   EXPECT_NE(c->opened_new_foreground_tab, NO);
 
   EXPECT_EQ(c->opened_new_window, NO);
   [c openAllBookmarksNewWindow:item];
   EXPECT_NE(c->opened_new_window, NO);
 
   EXPECT_EQ(c->opened_off_the_record, NO);
   [c openAllBookmarksIncognitoWindow:item];
   EXPECT_NE(c->opened_off_the_record, NO);
 }