mac: Update clients of scoped_nsobject.h.

ui/base/cocoa/menu_controller_unittest.mm

 // Copyright 2013 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 <Cocoa/Cocoa.h>
 
 #include "base/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 112 matching lines @@
   }
 
  private:
   const gfx::Font* font_;
   const int index_;
 };
 
 TEST_F(MenuControllerTest, EmptyMenu) {
   Delegate delegate;
   SimpleMenuModel model(&delegate);
-  scoped_nsobject<MenuController> menu(
+  base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 0);
 }
 
 TEST_F(MenuControllerTest, BasicCreation) {
   Delegate delegate;
   SimpleMenuModel model(&delegate);
   model.AddItem(1, ASCIIToUTF16("one"));
   model.AddItem(2, ASCIIToUTF16("two"));
   model.AddItem(3, ASCIIToUTF16("three"));
   model.AddSeparator(NORMAL_SEPARATOR);
   model.AddItem(4, ASCIIToUTF16("four"));
   model.AddItem(5, ASCIIToUTF16("five"));
 
-  scoped_nsobject<MenuController> menu(
+  base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 6);
 
   // Check the title, tag, and represented object are correct for a random
   // element.
   NSMenuItem* itemTwo = [[menu menu] itemAtIndex:2];
   NSString* title = [itemTwo title];
   EXPECT_EQ(ASCIIToUTF16("three"), base::SysNSStringToUTF16(title));
   EXPECT_EQ([itemTwo tag], 2);
   EXPECT_EQ([[itemTwo representedObject] pointerValue], &model);
 
   EXPECT_TRUE([[[menu menu] itemAtIndex:3] isSeparatorItem]);
 }
 
 TEST_F(MenuControllerTest, Submenus) {
   Delegate delegate;
   SimpleMenuModel model(&delegate);
   model.AddItem(1, ASCIIToUTF16("one"));
   SimpleMenuModel submodel(&delegate);
   submodel.AddItem(2, ASCIIToUTF16("sub-one"));
   submodel.AddItem(3, ASCIIToUTF16("sub-two"));
   submodel.AddItem(4, ASCIIToUTF16("sub-three"));
   model.AddSubMenuWithStringId(5, kTestLabelResourceId, &submodel);
   model.AddItem(6, ASCIIToUTF16("three"));
 
-  scoped_nsobject<MenuController> menu(
+  base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 3);
 
   // Inspect the submenu to ensure it has correct properties.
   NSMenu* submenu = [[[menu menu] itemAtIndex:1] submenu];
   EXPECT_TRUE(submenu);
   EXPECT_EQ([submenu numberOfItems], 3);
 
   // Inspect one of the items to make sure it has the correct model as its
   // represented object and the proper tag.
@@ skipping 12 matching lines @@
   EXPECT_EQ([[item representedObject] pointerValue], &model);
 }
 
 TEST_F(MenuControllerTest, EmptySubmenu) {
   Delegate delegate;
   SimpleMenuModel model(&delegate);
   model.AddItem(1, ASCIIToUTF16("one"));
   SimpleMenuModel submodel(&delegate);
   model.AddSubMenuWithStringId(2, kTestLabelResourceId, &submodel);
 
-  scoped_nsobject<MenuController> menu(
+  base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 2);
 }
 
 TEST_F(MenuControllerTest, PopUpButton) {
   Delegate delegate;
   SimpleMenuModel model(&delegate);
   model.AddItem(1, ASCIIToUTF16("one"));
   model.AddItem(2, ASCIIToUTF16("two"));
   model.AddItem(3, ASCIIToUTF16("three"));
 
   // Menu should have an extra item inserted at position 0 that has an empty
   // title.
-  scoped_nsobject<MenuController> menu(
+  base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:YES]);
   EXPECT_EQ([[menu menu] numberOfItems], 4);
   EXPECT_EQ(base::SysNSStringToUTF16([[[menu menu] itemAtIndex:0] title]),
             string16());
 
   // Make sure the tags are still correct (the index no longer matches the tag).
   NSMenuItem* itemTwo = [[menu menu] itemAtIndex:2];
   EXPECT_EQ([itemTwo tag], 1);
 }
 
 TEST_F(MenuControllerTest, Execute) {
   Delegate delegate;
   SimpleMenuModel model(&delegate);
   model.AddItem(1, ASCIIToUTF16("one"));
-  scoped_nsobject<MenuController> menu(
+  base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 1);
 
   // Fake selecting the menu item, we expect the delegate to be told to execute
   // a command.
   NSMenuItem* item = [[menu menu] itemAtIndex:0];
   [[item target] performSelector:[item action] withObject:item];
   EXPECT_EQ(delegate.execute_count_, 1);
 }
 
 void Validate(MenuController* controller, NSMenu* menu) {
   for (int i = 0; i < [menu numberOfItems]; ++i) {
     NSMenuItem* item = [menu itemAtIndex:i];
     [controller validateUserInterfaceItem:item];
     if ([item hasSubmenu])
       Validate(controller, [item submenu]);
   }
 }
 
 TEST_F(MenuControllerTest, Validate) {
   Delegate delegate;
   SimpleMenuModel model(&delegate);
   model.AddItem(1, ASCIIToUTF16("one"));
   model.AddItem(2, ASCIIToUTF16("two"));
   SimpleMenuModel submodel(&delegate);
   submodel.AddItem(2, ASCIIToUTF16("sub-one"));
   model.AddSubMenuWithStringId(3, kTestLabelResourceId, &submodel);
 
-  scoped_nsobject<MenuController> menu(
+  base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 3);
 
   Validate(menu.get(), [menu menu]);
 }
 
 // Tests that items which have a font set actually use that font.
 TEST_F(MenuControllerTest, LabelFont) {
   Delegate delegate;
   gfx::Font bold = (gfx::Font()).DeriveFont(0, gfx::Font::BOLD);
   FontMenuModel model(&delegate, &bold, 0);
   model.AddItem(1, ASCIIToUTF16("one"));
   model.AddItem(2, ASCIIToUTF16("two"));
 
-  scoped_nsobject<MenuController> menu(
+  base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 2);
 
   Validate(menu.get(), [menu menu]);
 
   EXPECT_TRUE([[[menu menu] itemAtIndex:0] attributedTitle] != nil);
   EXPECT_TRUE([[[menu menu] itemAtIndex:1] attributedTitle] == nil);
 }
 
 TEST_F(MenuControllerTest, DefaultInitializer) {
   Delegate delegate;
   SimpleMenuModel model(&delegate);
   model.AddItem(1, ASCIIToUTF16("one"));
   model.AddItem(2, ASCIIToUTF16("two"));
   model.AddItem(3, ASCIIToUTF16("three"));
 
-  scoped_nsobject<MenuController> menu([[MenuController alloc] init]);
+  base::scoped_nsobject<MenuController> menu([[MenuController alloc] init]);
   EXPECT_FALSE([menu menu]);
 
   [menu setModel:&model];
   [menu setUseWithPopUpButtonCell:NO];
   EXPECT_TRUE([menu menu]);
   EXPECT_EQ(3, [[menu menu] numberOfItems]);
 
   // Check immutability.
   model.AddItem(4, ASCIIToUTF16("four"));
   EXPECT_EQ(3, [[menu menu] numberOfItems]);
 }
 
 // Test that menus with dynamic labels actually get updated.
 TEST_F(MenuControllerTest, Dynamic) {
   DynamicDelegate delegate;
 
   // Create a menu containing a single item whose label is "initial" and who has
   // no icon.
   string16 initial = ASCIIToUTF16("initial");
   delegate.SetDynamicLabel(initial);
   SimpleMenuModel model(&delegate);
   model.AddItem(1, ASCIIToUTF16("foo"));
-  scoped_nsobject<MenuController> menu(
+  base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 1);
   // Validate() simulates opening the menu - the item label/icon should be
   // initialized after this so we can validate the menu contents.
   Validate(menu.get(), [menu menu]);
   NSMenuItem* item = [[menu menu] itemAtIndex:0];
   // Item should have the "initial" label and no icon.
   EXPECT_EQ(initial, base::SysNSStringToUTF16([item title]));
   EXPECT_EQ(nil, [item image]);
 
@@ skipping 21 matching lines @@
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
 
   // Create the model.
   Delegate delegate;
   SimpleMenuModel model(&delegate);
   model.AddItem(1, ASCIIToUTF16("allays"));
   model.AddItem(2, ASCIIToUTF16("i"));
   model.AddItem(3, ASCIIToUTF16("bf"));
 
   // Create the controller.
-  scoped_nsobject<MenuController> menu(
+  base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   delegate.menu_to_close_ = [menu menu];
 
   EXPECT_FALSE([menu isMenuOpen]);
 
   // In the event tracking run loop mode of the menu, verify that the controller
   // resports the menu as open.
   CFRunLoopPerformBlock(CFRunLoopGetCurrent(), NSEventTrackingRunLoopMode, ^{
       EXPECT_TRUE([menu isMenuOpen]);
   });
@@ skipping 17 matching lines @@
   // Pump the task that notifies the delegate.
   message_loop.RunUntilIdle();
 
   // Expect that the delegate got notified properly.
   EXPECT_TRUE(delegate.did_close_);
 }
 
 }  // namespace
 
 }  // namespace ui