mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_AVATAR_MENU_BUBBLE_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BROWSER_AVATAR_MENU_BUBBLE_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #import "ui/base/cocoa/tracking_area.h"
 
 class AvatarMenuModel;
 class Browser;
 
 // This window controller manages the bubble that displays a "menu" of profiles.
 // It is brought open by clicking on the avatar icon in the window frame.
 @interface AvatarMenuBubbleController : BaseBubbleController {
  @private
   // The model that contains the data from the backend.
   scoped_ptr<AvatarMenuModel> model_;
 
   // Array of the below view controllers.
-  scoped_nsobject<NSMutableArray> items_;
+  base::scoped_nsobject<NSMutableArray> items_;
 
   // Is set to true if the managed user has clicked on Switch Users.
   BOOL expanded_;
 }
 
 // Designated initializer. The browser is passed to the model for profile
 // information.
 - (id)initWithBrowser:(Browser*)parentBrowser
            anchoredAt:(NSPoint)point;
 
@@ skipping 21 matching lines @@
   __weak AvatarMenuBubbleController* controller_;
 
   // The AvatarMenuModel::item.model_index field.
   size_t modelIndex_;
 
   // Tracks whether this item is currently highlighted.
   BOOL isHighlighted_;
 
   // The animation showing the edit link, which is run after the user has
   // dwelled over the item for a short delay.
-  scoped_nsobject<NSAnimation> linkAnimation_;
+  base::scoped_nsobject<NSAnimation> linkAnimation_;
 
   // Instance variables that back the outlets.
   __weak NSImageView* iconView_;
   __weak NSImageView* activeView_;
   __weak NSTextField* nameField_;
   // These two views sit on top of each other, and only one is visible at a
   // time. The editButton_ is visible when the mouse is over the item and the
   // emailField_ is visible otherwise.
   __weak NSTextField* emailField_;
   __weak NSButton* editButton_;
@@ skipping 53 matching lines @@
          anchoredAt:(NSPoint)point;
 - (void)performLayout;
 - (NSMutableArray*)items;
 @end
 
 @interface AvatarMenuItemController (ExposedForTesting)
 - (void)willStartAnimation:(NSAnimation*)animation;
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_AVATAR_MENU_BUBBLE_CONTROLLER_H_