mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/menu_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"
 #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_;
 }
 - (BOOL)isOpen;
 - (BOOL)didOpen;
 @end
 
 @implementation MenuButtonTestDelegate
 - (id)initWithMenu:(NSMenu*)menu {
   if ((self = [super init])) {
@@ skipping 30 matching lines @@
   open_ = NO;
 }
 @end
 
 namespace {
 
 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_];
   }
 
   NSMenu* CreateMenu() {
     NSMenu* menu = [[NSMenu alloc] initWithTitle:@""];
     [menu insertItemWithTitle:@"" action:nil keyEquivalent:@"" atIndex:0];
     [menu insertItemWithTitle:@"foo" action:nil keyEquivalent:@"" atIndex:1];
     [menu insertItemWithTitle:@"bar" action:nil keyEquivalent:@"" atIndex:2];
@@ skipping 18 matching lines @@
     return event;
   }
 
   MenuButton* button_;
 };
 
 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];
   EXPECT_TRUE([button_ attachedMenu]);
 }
 
 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());
 
   [menu setDelegate:delegate.get()];
   [button_ setAttachedMenu:menu];
   [button_ setOpenMenuOnClick:YES];
 
   EXPECT_FALSE([delegate isOpen]);
   EXPECT_FALSE([delegate didOpen]);
 
   // Should open the menu.
   [button_ performClick:nil];
 
   EXPECT_TRUE([delegate didOpen]);
   EXPECT_FALSE([delegate isOpen]);
 }
 
 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());
 
   [menu setDelegate:delegate.get()];
   [button_ setAttachedMenu:menu];
   [button_ setOpenMenuOnClick:YES];
   // Right click is enabled.
   [button_ setOpenMenuOnRightClick:YES];
 
   EXPECT_FALSE([delegate isOpen]);
   EXPECT_FALSE([delegate didOpen]);
 
   // Should open the menu.
   NSEvent* event = MouseDownEvent(NSRightMouseDown);
   [button_ rightMouseDown:event];
 
   EXPECT_TRUE([delegate didOpen]);
   EXPECT_FALSE([delegate isOpen]);
 }
 
 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());
 
   [menu setDelegate:delegate.get()];
   [button_ setAttachedMenu:menu];
   [button_ setOpenMenuOnClick:YES];
 
   EXPECT_FALSE([delegate isOpen]);
   EXPECT_FALSE([delegate didOpen]);
 
   // Should not open the menu.
   NSEvent* event = MouseDownEvent(NSRightMouseDown);
   [button_ rightMouseDown:event];
 
   EXPECT_FALSE([delegate didOpen]);
   EXPECT_FALSE([delegate isOpen]);
 
   // Should open the menu in this case.
   [button_ performClick:nil];
 
   EXPECT_TRUE([delegate didOpen]);
   EXPECT_FALSE([delegate isOpen]);
 }
 
 }  // namespace