mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_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.
 
 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h"
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/message_loop/message_pump_mac.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
@@ skipping 91 matching lines @@
 
   [controller() close];
 }
 
 TEST_F(AvatarMenuBubbleControllerTest, PerformLayout) {
   [controller() showWindow:nil];
 
   NSView* contents = [[controller() window] contentView];
   EXPECT_EQ(4U, [[contents subviews] count]);
 
-  scoped_nsobject<NSMutableArray> oldItems([[controller() items] copy]);
+  base::scoped_nsobject<NSMutableArray> oldItems([[controller() items] copy]);
 
   // Now create a new profile and notify the delegate.
   manager()->CreateTestingProfile("test3", scoped_ptr<PrefServiceSyncable>(),
                                   ASCIIToUTF16("Test 3"), 0);
 
   // Testing the bridge is not worth the effort...
   [controller() performLayout];
 
   EXPECT_EQ(5U, [[contents subviews] count]);
 
@@ skipping 43 matching lines @@
 }
 
 - (void)sendHighlightMessageForMouseExited {
   [self highlightForEventType:NSMouseExited];
   // Quit the pump because the animation was cancelled before it even ran.
   pump_->Quit();
 }
 @end
 
 TEST_F(AvatarMenuBubbleControllerTest, HighlightForEventType) {
-  scoped_nsobject<TestingAvatarMenuItemController> item(
+  base::scoped_nsobject<TestingAvatarMenuItemController> item(
       [[TestingAvatarMenuItemController alloc] initWithModelIndex:0
                                                    menuController:nil]);
   // Test non-active states first.
   [[item activeView] setHidden:YES];
 
   NSView* editButton = [item editButton];
   NSView* emailField = [item emailField];
 
   // The edit link remains hidden.
   [item setIsHighlighted:YES];
@@ skipping 59 matching lines @@
   [controller() keyDown:event];
   EXPECT_EQ([[controller() items] objectAtIndex:0], GetHighlightedItem());
 
   [controller() keyDown:event];
   EXPECT_EQ([[controller() items] objectAtIndex:1], GetHighlightedItem());
 
   // There are no more items now so going up should stay at the first item.
   [controller() keyDown:event];
   EXPECT_EQ([[controller() items] objectAtIndex:1], GetHighlightedItem());
 }