mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/menu_button_unittest.mm

Index: chrome/browser/ui/cocoa/menu_button_unittest.mm
diff --git a/chrome/browser/ui/cocoa/menu_button_unittest.mm b/chrome/browser/ui/cocoa/menu_button_unittest.mm
index 543208fae11b4c6dd8215122464e6d88e5fbfe07..95b00dc096525e8d1dd7a0df8af3b15f548e00ea 100644
--- a/chrome/browser/ui/cocoa/menu_button_unittest.mm
+++ b/chrome/browser/ui/cocoa/menu_button_unittest.mm
@@ -2,14 +2,14 @@
 // 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/clickhold_button_cell.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 
 @interface MenuButtonTestDelegate : NSObject<NSMenuDelegate> {
  @private
-  scoped_nsobject<NSMenu> menu_;
+  base::scoped_nsobject<NSMenu> menu_;
   BOOL open_;
   BOOL didOpen_;
 }
@@ -60,10 +60,10 @@ class MenuButtonTest : public CocoaTest {
  public:
   MenuButtonTest() {
     NSRect frame = NSMakeRect(0, 0, 50, 30);
-    scoped_nsobject<MenuButton> button(
+    base::scoped_nsobject<MenuButton> button(
         [[MenuButton alloc] initWithFrame:frame]);
     button_ = button.get();
-    scoped_nsobject<ClickHoldButtonCell> cell(
+    base::scoped_nsobject<ClickHoldButtonCell> cell(
         [[ClickHoldButtonCell alloc] initTextCell:@"Testing"]);
     [button_ setCell:cell.get()];
     [[test_window() contentView] addSubview:button_];
@@ -102,7 +102,7 @@ TEST_VIEW(MenuButtonTest, button_);
 
 // Test assigning a menu, again mostly to ensure nothing leaks or crashes.
 TEST_F(MenuButtonTest, MenuAssign) {
-  scoped_nsobject<NSMenu> menu(CreateMenu());
+  base::scoped_nsobject<NSMenu> menu(CreateMenu());
   ASSERT_TRUE(menu.get());
 
   [button_ setAttachedMenu:menu];
@@ -110,10 +110,10 @@ TEST_F(MenuButtonTest, MenuAssign) {
 }
 
 TEST_F(MenuButtonTest, OpenOnClick) {
-  scoped_nsobject<NSMenu> menu(CreateMenu());
+  base::scoped_nsobject<NSMenu> menu(CreateMenu());
   ASSERT_TRUE(menu.get());
 
-  scoped_nsobject<MenuButtonTestDelegate> delegate(
+  base::scoped_nsobject<MenuButtonTestDelegate> delegate(
       [[MenuButtonTestDelegate alloc] initWithMenu:menu.get()]);
   ASSERT_TRUE(delegate.get());
 
@@ -132,10 +132,10 @@ TEST_F(MenuButtonTest, OpenOnClick) {
 }
 
 TEST_F(MenuButtonTest, OpenOnRightClick) {
-  scoped_nsobject<NSMenu> menu(CreateMenu());
+  base::scoped_nsobject<NSMenu> menu(CreateMenu());
   ASSERT_TRUE(menu.get());
 
-  scoped_nsobject<MenuButtonTestDelegate> delegate(
+  base::scoped_nsobject<MenuButtonTestDelegate> delegate(
       [[MenuButtonTestDelegate alloc] initWithMenu:menu.get()]);
   ASSERT_TRUE(delegate.get());
 
@@ -157,10 +157,10 @@ TEST_F(MenuButtonTest, OpenOnRightClick) {
 }
 
 TEST_F(MenuButtonTest, DontOpenOnRightClickWithoutSetRightClick) {
-  scoped_nsobject<NSMenu> menu(CreateMenu());
+  base::scoped_nsobject<NSMenu> menu(CreateMenu());
   ASSERT_TRUE(menu.get());
 
-  scoped_nsobject<MenuButtonTestDelegate> delegate(
+  base::scoped_nsobject<MenuButtonTestDelegate> delegate(
       [[MenuButtonTestDelegate alloc] initWithMenu:menu.get()]);
   ASSERT_TRUE(delegate.get());