mac: Update clients of scoped_nsobject.h.

ui/base/cocoa/focus_tracker_unittest.mm

Index: ui/base/cocoa/focus_tracker_unittest.mm
diff --git a/ui/base/cocoa/focus_tracker_unittest.mm b/ui/base/cocoa/focus_tracker_unittest.mm
index 53aae6e980132ef4720e2a7461495aa7f827bfdb..0fb70c143feb53ca2665534a57b13b0d8456162a 100644
--- a/ui/base/cocoa/focus_tracker_unittest.mm
+++ b/ui/base/cocoa/focus_tracker_unittest.mm
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #import "ui/base/cocoa/focus_tracker.h"
@@ -16,7 +16,8 @@ class FocusTrackerTest : public ui::CocoaTest {
  public:
   virtual void SetUp() {
     ui::CocoaTest::SetUp();
-    scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
+    base::scoped_nsobject<NSView> view(
+        [[NSView alloc] initWithFrame:NSZeroRect]);
     viewA_ = view.get();
     [[test_window() contentView] addSubview:viewA_];
 
@@ -33,7 +34,7 @@ class FocusTrackerTest : public ui::CocoaTest {
 TEST_F(FocusTrackerTest, SaveRestore) {
   NSWindow* window = test_window();
   ASSERT_TRUE([window makeFirstResponder:viewA_]);
-  scoped_nsobject<FocusTracker> tracker(
+  base::scoped_nsobject<FocusTracker> tracker(
       [[FocusTracker alloc] initWithWindow:window]);
   // Give focus to |viewB_|, then try and restore it to view1.
   ASSERT_TRUE([window makeFirstResponder:viewB_]);
@@ -45,12 +46,13 @@ TEST_F(FocusTrackerTest, SaveRestoreWithTextView) {
   // Valgrind will complain if the text field has zero size.
   NSRect frame = NSMakeRect(0, 0, 100, 20);
   NSWindow* window = test_window();
-  scoped_nsobject<NSTextField> text([[NSTextField alloc] initWithFrame:frame]);
+  base::scoped_nsobject<NSTextField> text(
+      [[NSTextField alloc] initWithFrame:frame]);
   [[window contentView] addSubview:text];
 
   ASSERT_TRUE([window makeFirstResponder:text]);
-  scoped_nsobject<FocusTracker> tracker([[FocusTracker alloc]
-                                         initWithWindow:window]);
+  base::scoped_nsobject<FocusTracker> tracker(
+      [[FocusTracker alloc] initWithWindow:window]);
   // Give focus to |viewB_|, then try and restore it to the text field.
   ASSERT_TRUE([window makeFirstResponder:viewB_]);
   EXPECT_TRUE([tracker restoreFocusInWindow:window]);
@@ -59,11 +61,12 @@ TEST_F(FocusTrackerTest, SaveRestoreWithTextView) {
 
 TEST_F(FocusTrackerTest, DontRestoreToViewNotInWindow) {
   NSWindow* window = test_window();
-  scoped_nsobject<NSView> viewC([[NSView alloc] initWithFrame:NSZeroRect]);
+  base::scoped_nsobject<NSView> viewC(
+      [[NSView alloc] initWithFrame:NSZeroRect]);
   [[window contentView] addSubview:viewC];
 
   ASSERT_TRUE([window makeFirstResponder:viewC]);
-  scoped_nsobject<FocusTracker> tracker(
+  base::scoped_nsobject<FocusTracker> tracker(
       [[FocusTracker alloc] initWithWindow:window]);
 
   // Give focus to |viewB_|, then remove viewC from the hierarchy and try
@@ -76,7 +79,7 @@ TEST_F(FocusTrackerTest, DontRestoreToViewNotInWindow) {
 TEST_F(FocusTrackerTest, DontRestoreFocusToViewInDifferentWindow) {
   NSWindow* window = test_window();
   ASSERT_TRUE([window makeFirstResponder:viewA_]);
-  scoped_nsobject<FocusTracker> tracker(
+  base::scoped_nsobject<FocusTracker> tracker(
       [[FocusTracker alloc] initWithWindow:window]);
 
   // Give focus to |viewB_|, then try and restore focus in a different