mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/base_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/base_bubble_controller.h"
 
 #include "base/mac/mac_util.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/run_loop_testing.h"
 #import "ui/base/test/cocoa_test_event_utils.h"
 
 namespace {
 const CGFloat kBubbleWindowWidth = 100;
 const CGFloat kBubbleWindowHeight = 50;
 const CGFloat kAnchorPointX = 400;
 const CGFloat kAnchorPointY = 300;
@@ skipping 18 matching lines @@
   }
 
   virtual void TearDown() OVERRIDE {
     // Close our windows.
     [controller_ close];
     bubbleWindow_.reset(NULL);
     CocoaTest::TearDown();
   }
 
  public:
-  scoped_nsobject<NSWindow> bubbleWindow_;
+  base::scoped_nsobject<NSWindow> bubbleWindow_;
   BaseBubbleController* controller_;
 };
 
 // Test that kAlignEdgeToAnchorEdge and a left bubble arrow correctly aligns the
 // left edge of the buble to the anchor point.
 TEST_F(BaseBubbleControllerTest, LeftAlign) {
   [[controller_ bubble] setArrowLocation:info_bubble::kTopLeft];
   [[controller_ bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge];
   [controller_ showWindow:nil];
 
@@ skipping 53 matching lines @@
   // Make sure the bubble arrow points to the anchor.
   EXPECT_EQ(NSMaxX(frame) - info_bubble::kBubbleArrowXOffset -
       floorf(info_bubble::kBubbleArrowWidth / 2.0), kAnchorPointX);
   EXPECT_GE(NSMaxY(frame), kAnchorPointY);
 }
 
 // Tests that when a new window gets key state (and the bubble resigns) that
 // the key window changes.
 TEST_F(BaseBubbleControllerTest, ResignKeyCloses) {
   // Closing the bubble will autorelease the controller.
-  scoped_nsobject<BaseBubbleController> keep_alive([controller_ retain]);
+  base::scoped_nsobject<BaseBubbleController> keep_alive([controller_ retain]);
 
   NSWindow* bubble_window = [controller_ window];
   EXPECT_FALSE([bubble_window isVisible]);
 
-  scoped_nsobject<NSWindow> other_window(
+  base::scoped_nsobject<NSWindow> other_window(
       [[NSWindow alloc] initWithContentRect:NSMakeRect(500, 500, 500, 500)
                                   styleMask:NSTitledWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:YES]);
   EXPECT_FALSE([other_window isVisible]);
 
   [controller_ showWindow:nil];
   EXPECT_TRUE([bubble_window isVisible]);
   EXPECT_FALSE([other_window isVisible]);
 
@@ skipping 19 matching lines @@
   EXPECT_TRUE([other_window isVisible]);
 }
 
 // Test that clicking outside the window causes the bubble to close.
 TEST_F(BaseBubbleControllerTest, LionClickOutsideCloses) {
   // The event tap is only installed on 10.7+.
   if (!base::mac::IsOSLionOrLater())
     return;
 
   // Closing the bubble will autorelease the controller.
-  scoped_nsobject<BaseBubbleController> keep_alive([controller_ retain]);
+  base::scoped_nsobject<BaseBubbleController> keep_alive([controller_ retain]);
   NSWindow* window = [controller_ window];
 
   EXPECT_FALSE([window isVisible]);
 
   [controller_ showWindow:nil];
 
   EXPECT_TRUE([window isVisible]);
 
   NSEvent* event = cocoa_test_event_utils::LeftMouseDownAtPointInWindow(
       NSMakePoint(10, 10), test_window());
   [NSApp sendEvent:event];
   chrome::testing::NSRunLoopRunAllPending();
 
   EXPECT_FALSE([window isVisible]);
 }