mac: Update clients of scoped_nsobject.h.

ui/message_center/cocoa/popup_collection.h

 // Copyright (c) 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.
 
 #ifndef UI_MESSAGE_CENTER_COCOA_POPUP_COLLECTION_H_
 #define UI_MESSAGE_CENTER_COCOA_POPUP_COLLECTION_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include <set>
 
 #include "base/mac/scoped_block.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #import "base/memory/scoped_ptr.h"
 #include "ui/message_center/message_center_export.h"
 
 namespace message_center {
 class MessageCenter;
 class MessageCenterObserver;
 }
 
 namespace message_center {
 typedef void(^AnimationEndedCallback)();
 }
 
 // A popup collection interfaces with the MessageCenter as an observer. It will
 // arrange notifications on the screen as popups, starting in the upper-right
 // corner, going to the bottom of the screen. This class maintains ownership of
 // the Cocoa controllers and windows of the notifications.
 MESSAGE_CENTER_EXPORT
 @interface MCPopupCollection : NSObject {
  @private
   // The message center that is responsible for the notifications. Weak, global.
   message_center::MessageCenter* messageCenter_;
 
   // MessageCenterObserver implementation.
   scoped_ptr<message_center::MessageCenterObserver> observer_;
 
   // Array of all on-screen popup notifications.
-  scoped_nsobject<NSMutableArray> popups_;
+  base::scoped_nsobject<NSMutableArray> popups_;
 
   // Array of all on-screen popup notifications that are being faded out
   // for removal.
-  scoped_nsobject<NSMutableArray> popupsBeingRemoved_;
+  base::scoped_nsobject<NSMutableArray> popupsBeingRemoved_;
 
   // For testing only. If not a zero rect, this is the screen size to use
   // for laying out popups.
   NSRect testingScreenFrame_;
 
   // The duration of the popup animation, in the number of seconds.
   NSTimeInterval popupAnimationDuration_;
 
   // Set of notification IDs for those popups to be updated when all existing
   // animations end.
@@ skipping 37 matching lines @@
 // to a very small value to expedite the test running.
 - (void)setAnimationDuration:(NSTimeInterval)duration;
 
 // Setter for testingAnimationEndedCallback_. The testing code could set it
 // to get called back when the animation ends.
 - (void)setAnimationEndedCallback:
     (message_center::AnimationEndedCallback)callback;
 @end
 
 #endif  // UI_MESSAGE_CENTER_COCOA_POPUP_COLLECTION_H_