mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/constrained_window/constrained_window_animation_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.
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/message_loop/message_pump_mac.h"
+#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 
 // This class runs an animation for exactly two frames then end it.
 @interface ConstrainedWindowAnimationTestDelegate : NSObject
                                                    <NSAnimationDelegate> {
  @private
   CGFloat frameCount_;
   scoped_refptr<base::MessagePumpNSRunLoop> message_pump_;
 }
 
 - (void)runAnimation:(NSAnimation*)animation;
@@ skipping 31 matching lines @@
 }
 
 @end
 
 class ConstrainedWindowAnimationTest : public CocoaTest {
  protected:
   ConstrainedWindowAnimationTest() : CocoaTest() {
     delegate_.reset([[ConstrainedWindowAnimationTestDelegate alloc] init]);
   }
 
-  scoped_nsobject<ConstrainedWindowAnimationTestDelegate> delegate_;
+  base::scoped_nsobject<ConstrainedWindowAnimationTestDelegate> delegate_;
 };
 
 // Test the show animation.
 TEST_F(ConstrainedWindowAnimationTest, Show) {
-  scoped_nsobject<NSAnimation> animation(
+  base::scoped_nsobject<NSAnimation> animation(
       [[ConstrainedWindowAnimationShow alloc] initWithWindow:test_window()]);
   [delegate_ runAnimation:animation];
 }
 
 // Test the hide animation.
 TEST_F(ConstrainedWindowAnimationTest, Hide) {
-  scoped_nsobject<NSAnimation> animation(
+  base::scoped_nsobject<NSAnimation> animation(
       [[ConstrainedWindowAnimationHide alloc] initWithWindow:test_window()]);
   [delegate_ runAnimation:animation];
 }
 
 // Test the pulse animation.
 TEST_F(ConstrainedWindowAnimationTest, Pulse) {
-  scoped_nsobject<NSAnimation> animation(
+  base::scoped_nsobject<NSAnimation> animation(
       [[ConstrainedWindowAnimationPulse alloc] initWithWindow:test_window()]);
   [delegate_ runAnimation:animation];
 }