mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm

 // Copyright (c) 2011 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 <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/window_size_autosaver.h"
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 class WindowSizeAutosaverTest : public CocoaProfileTest {
@@ skipping 42 matching lines @@
                                       defer:NO];
 
   // Ask the window to save its position, then check that a preference
   // exists.  We're technically passing in a pointer to the user prefs
   // and not the local state prefs, but a PrefService* is a
   // PrefService*, and this is a unittest.
 
   {
     NSRect frame = [window_ frame];
     // Empty state, shouldn't restore:
-    scoped_nsobject<WindowSizeAutosaver> sizeSaver([[WindowSizeAutosaver alloc]
-        initWithWindow:window_
-           prefService:pref
-                  path:path_]);
+    base::scoped_nsobject<WindowSizeAutosaver> sizeSaver(
+        [[WindowSizeAutosaver alloc] initWithWindow:window_
+                                        prefService:pref
+                                               path:path_]);
     EXPECT_EQ(NSMinX(frame), NSMinX([window_ frame]));
     EXPECT_EQ(NSMinY(frame), NSMinY([window_ frame]));
     EXPECT_EQ(NSWidth(frame), NSWidth([window_ frame]));
     EXPECT_EQ(NSHeight(frame), NSHeight([window_ frame]));
 
     // Move and resize window, should store position but not size.
     [window_ setFrame:NSMakeRect(300, 310, 250, 252) display:NO];
   }
 
   // Another window movement -- shouldn't be recorded.
   [window_ setFrame:NSMakeRect(400, 420, 160, 162) display:NO];
 
   {
     // Should restore last stored position, but not size.
-    scoped_nsobject<WindowSizeAutosaver> sizeSaver([[WindowSizeAutosaver alloc]
-        initWithWindow:window_
-           prefService:pref
-                  path:path_]);
+    base::scoped_nsobject<WindowSizeAutosaver> sizeSaver(
+        [[WindowSizeAutosaver alloc] initWithWindow:window_
+                                        prefService:pref
+                                               path:path_]);
     EXPECT_EQ(300, NSMinX([window_ frame]));
     EXPECT_EQ(310, NSMinY([window_ frame]));
     EXPECT_EQ(160, NSWidth([window_ frame]));
     EXPECT_EQ(162, NSHeight([window_ frame]));
   }
 
   // ...and it should be in the profile, too.
   EXPECT_TRUE(pref->GetDictionary(path_) != NULL);
   int x, y;
   const DictionaryValue* windowPref = pref->GetDictionary(path_);
@@ skipping 17 matching lines @@
   EXPECT_TRUE(placement->empty());
 
   // Ask the window to save its position, then check that a preference
   // exists.  We're technically passing in a pointer to the user prefs
   // and not the local state prefs, but a PrefService* is a
   // PrefService*, and this is a unittest.
 
   {
     NSRect frame = [window_ frame];
     // Empty state, shouldn't restore:
-    scoped_nsobject<WindowSizeAutosaver> sizeSaver([[WindowSizeAutosaver alloc]
-        initWithWindow:window_
-           prefService:pref
-                  path:path_]);
+    base::scoped_nsobject<WindowSizeAutosaver> sizeSaver(
+        [[WindowSizeAutosaver alloc] initWithWindow:window_
+                                        prefService:pref
+                                               path:path_]);
     EXPECT_EQ(NSMinX(frame), NSMinX([window_ frame]));
     EXPECT_EQ(NSMinY(frame), NSMinY([window_ frame]));
     EXPECT_EQ(NSWidth(frame), NSWidth([window_ frame]));
     EXPECT_EQ(NSHeight(frame), NSHeight([window_ frame]));
 
     // Move and resize window, should store
     [window_ setFrame:NSMakeRect(300, 310, 250, 252) display:NO];
   }
 
   // Another window movement -- shouldn't be recorded.
   [window_ setFrame:NSMakeRect(400, 420, 160, 162) display:NO];
 
   {
     // Should restore last stored size
-    scoped_nsobject<WindowSizeAutosaver> sizeSaver([[WindowSizeAutosaver alloc]
-        initWithWindow:window_
-           prefService:pref
-                  path:path_]);
+    base::scoped_nsobject<WindowSizeAutosaver> sizeSaver(
+        [[WindowSizeAutosaver alloc] initWithWindow:window_
+                                        prefService:pref
+                                               path:path_]);
     EXPECT_EQ(300, NSMinX([window_ frame]));
     EXPECT_EQ(310, NSMinY([window_ frame]));
     EXPECT_EQ(250, NSWidth([window_ frame]));
     EXPECT_EQ(252, NSHeight([window_ frame]));
   }
 
   // ...and it should be in the profile, too.
   EXPECT_TRUE(pref->GetDictionary(path_) != NULL);
   int x1, y1, x2, y2;
   const DictionaryValue* windowPref = pref->GetDictionary(path_);
@@ skipping 17 matching lines @@
   DictionaryPrefUpdate update(pref, path_);
   DictionaryValue* windowPref = update.Get();
   windowPref->SetInteger("left", 50);
   windowPref->SetInteger("right", 50);
   windowPref->SetInteger("top", 60);
   windowPref->SetInteger("bottom", 60);
 
   {
     // Window rect shouldn't change...
     NSRect frame = [window_ frame];
-    scoped_nsobject<WindowSizeAutosaver> sizeSaver([[WindowSizeAutosaver alloc]
-        initWithWindow:window_
-           prefService:pref
-                  path:path_]);
+    base::scoped_nsobject<WindowSizeAutosaver> sizeSaver(
+        [[WindowSizeAutosaver alloc] initWithWindow:window_
+                                        prefService:pref
+                                               path:path_]);
     EXPECT_EQ(NSMinX(frame), NSMinX([window_ frame]));
     EXPECT_EQ(NSMinY(frame), NSMinY([window_ frame]));
     EXPECT_EQ(NSWidth(frame), NSWidth([window_ frame]));
     EXPECT_EQ(NSHeight(frame), NSHeight([window_ frame]));
   }
 
   // ...and it should be gone from the profile, too.
   EXPECT_TRUE(pref->GetDictionary(path_) != NULL);
   int x1, y1, x2, y2;
   EXPECT_FALSE(windowPref->GetInteger("x", &x1));
   EXPECT_FALSE(windowPref->GetInteger("y", &x1));
   ASSERT_FALSE(windowPref->GetInteger("left", &x1));
   ASSERT_FALSE(windowPref->GetInteger("right", &x2));
   ASSERT_FALSE(windowPref->GetInteger("top", &y1));
   ASSERT_FALSE(windowPref->GetInteger("bottom", &y2));
 }
 
 }  // namespace