mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/nsmenuitem_additions_unittest.mm

 // Copyright (c) 2011 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 "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
 
 #include <Carbon/Carbon.h>
 
 #include <ostream>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 NSEvent* KeyEvent(const NSUInteger modifierFlags,
                   NSString* chars,
                   NSString* charsNoMods,
                   const NSUInteger keyCode) {
   return [NSEvent keyEventWithType:NSKeyDown
                           location:NSZeroPoint
                      modifierFlags:modifierFlags
@@ skipping 27 matching lines @@
     bool compareCocoa) {
   EXPECT_EQ(result, [item cr_firesForKeyEvent:key]) << key << '\n' << item;
 
   // Make sure that Cocoa does in fact agree with our expectations. However,
   // in some cases cocoa behaves weirdly (if you create e.g. a new event that
   // contains all fields of the event that you get when hitting cmd-a with a
   // russion keyboard layout, the copy won't fire a menu item that has cmd-a as
   // key equivalent, even though the original event would) and isn't a good
   // oracle function.
   if (compareCocoa) {
-    scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@"Menu!"]);
+    base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@"Menu!"]);
     [menu setAutoenablesItems:NO];
     EXPECT_FALSE([menu performKeyEquivalent:key]);
     [menu addItem:item];
     EXPECT_EQ(result, [menu performKeyEquivalent:key]) << key << '\n' << item;
   }
 }
 
 void ExpectKeyFiresItem(
     NSEvent* key, NSMenuItem* item, bool compareCocoa = true) {
   ExpectKeyFiresItemEq(true, key, item, compareCocoa);
@@ skipping 272 matching lines @@
     }
 
     EventModifiers modifiers = cmdKey >> 8;
     NSString* chars = keyCodeToCharacter(keyCode, modifiers, ref);
     NSString* charsIgnoringMods = keyCodeToCharacter(keyCode, 0, ref);
     NSEvent* key = KeyEvent(0x100000, chars, charsIgnoringMods, keyCode);
     ExpectKeyFiresItem(key, item, false);
   }
   CFRelease(list);
 }