mac: Update clients of scoped_nsobject.h.

1.) The header is now in base/mac instead of base/memory
2.) The class is now in namespace base.

This CL was created programmatically by running:

1.)
    git grep -l memory/scoped_nsobject.h | xargs sed -i -e 's/memory\/scoped_nsobject.h/mac\/scoped_nsobject.h/g'
    for f in $(git diff --name-only origin); do tools/sort-headers.py $f -f; done
    git commit -a -m headers
    # manually undo changes to gypi file
    git cl upload # patch set 1
2.)
    git grep -l 'scoped_nsobject<' | xargs sed -i -e 's/scoped_nsobject</base::scoped_nsobject</g'
    # manually undo comment changes in scoped_nsobject.h, tracking_area.h
    git commit -a -m format
    git cl upload # patch set 2
    # Manually audit all files, file bugs and clean up bad clang-format decisions
    git cl upload # patch set 3
BUG=251957
TBR=mark@chromium.org

Review URL: https://codereview.chromium.org/17593006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208283 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 11 deletions

diff --git a/ui/base/cocoa/menu_controller_unittest.mm b/ui/base/cocoa/menu_controller_unittest.mm
index 507f5fe..f4cdf0f 100644
--- a/ui/base/cocoa/menu_controller_unittest.mm
+++ b/ui/base/cocoa/menu_controller_unittest.mm
@@ -130,7 +130,7 @@ class FontMenuModel : public SimpleMenuModel {
 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);
 }
@@ -145,7 +145,7 @@ TEST_F(MenuControllerTest, BasicCreation) {
   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);
 
@@ -171,7 +171,7 @@ TEST_F(MenuControllerTest, Submenus) {
   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);
 
@@ -204,7 +204,7 @@ TEST_F(MenuControllerTest, EmptySubmenu) {
   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);
 }
@@ -218,7 +218,7 @@ TEST_F(MenuControllerTest, PopUpButton) {
 
   // 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]),
@@ -233,7 +233,7 @@ 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);
 
@@ -262,7 +262,7 @@ TEST_F(MenuControllerTest, Validate) {
   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);
 
@@ -277,7 +277,7 @@ TEST_F(MenuControllerTest, LabelFont) {
   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);
 
@@ -294,7 +294,7 @@ TEST_F(MenuControllerTest, DefaultInitializer) {
   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];
@@ -317,7 +317,7 @@ TEST_F(MenuControllerTest, Dynamic) {
   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
@@ -359,7 +359,7 @@ TEST_F(MenuControllerTest, OpenClose) {
   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];