mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/browser_window_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/browser_window_controller.h"
 
 #include "base/mac/mac_util.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/signin/fake_auth_status_provider.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/signin_global_error.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 615 matching lines @@
   EXPECT_GT(findBar_index, bookmark_index);
 }
 
 // Tests that status bubble's base frame does move when devTools are docked.
 TEST_F(BrowserWindowControllerTest, TestStatusBubblePositioning) {
   ASSERT_EQ(1U, [[[controller_ devToolsView] subviews] count]);
 
   NSPoint bubbleOrigin = [controller_ statusBubbleBaseFrame].origin;
 
   // Add a fake subview to devToolsView to emulate docked devTools.
-  scoped_nsobject<NSView> view(
+  base::scoped_nsobject<NSView> view(
       [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 10, 10)]);
   [[controller_ devToolsView] addSubview:view];
   [[controller_ devToolsView] adjustSubviews];
 
   NSPoint bubbleOriginWithDevTools = [controller_ statusBubbleBaseFrame].origin;
 
   // Make sure that status bubble frame is moved.
   EXPECT_FALSE(NSEqualPoints(bubbleOrigin, bubbleOriginWithDevTools));
 }
 
 TEST_F(BrowserWindowControllerTest, TestSigninMenuItemNoErrors) {
-  scoped_nsobject<NSMenuItem> syncMenuItem(
+  base::scoped_nsobject<NSMenuItem> syncMenuItem(
       [[NSMenuItem alloc] initWithTitle:@""
                                  action:@selector(commandDispatch)
                           keyEquivalent:@""]);
   [syncMenuItem setTag:IDC_SHOW_SYNC_SETUP];
 
   NSString* startSignin =
     l10n_util::GetNSStringFWithFixup(
         IDS_SYNC_MENU_PRE_SYNCED_LABEL,
         l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
 
@@ skipping 23 matching lines @@
     ProfileSyncServiceFactory::GetForProfile(profile());
   sync->SetSyncSetupCompleted();
   [BrowserWindowController updateSigninItem:syncMenuItem
                                  shouldShow:YES
                              currentProfile:profile()];
   EXPECT_TRUE([[syncMenuItem title] isEqualTo:alreadySignedIn]);
   EXPECT_FALSE([syncMenuItem isHidden]);
 }
 
 TEST_F(BrowserWindowControllerTest, TestSigninMenuItemAuthError) {
-  scoped_nsobject<NSMenuItem> syncMenuItem(
+  base::scoped_nsobject<NSMenuItem> syncMenuItem(
       [[NSMenuItem alloc] initWithTitle:@""
                                  action:@selector(commandDispatch)
                           keyEquivalent:@""]);
   [syncMenuItem setTag:IDC_SHOW_SYNC_SETUP];
 
   // Now sign in.
   std::string username = "foo@example.com";
   SigninManager* signin = SigninManagerFactory::GetForProfile(profile());
   signin->SetAuthenticatedUsername(username);
   ProfileSyncService* sync =
@@ skipping 10 matching lines @@
   NSString* authError =
     l10n_util::GetNSStringWithFixup(IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM);
   EXPECT_TRUE([[syncMenuItem title] isEqualTo:authError]);
   EXPECT_FALSE([syncMenuItem isHidden]);
 
 }
 
 // If there's a separator after the signin menu item, make sure it is hidden/
 // shown when the signin menu item is.
 TEST_F(BrowserWindowControllerTest, TestSigninMenuItemWithSeparator) {
-  scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@""]);
+  base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@""]);
   NSMenuItem* signinMenuItem =
       [menu addItemWithTitle:@""
                       action:@selector(commandDispatch)
                keyEquivalent:@""];
   [signinMenuItem setTag:IDC_SHOW_SYNC_SETUP];
   NSMenuItem* followingSeparator = [NSMenuItem separatorItem];
   [menu addItem:followingSeparator];
   [signinMenuItem setHidden:NO];
   [followingSeparator setHidden:NO];
 
@@ skipping 10 matching lines @@
                              currentProfile:profile()];
 
   EXPECT_FALSE([followingSeparator isEnabled]);
   EXPECT_FALSE([signinMenuItem isHidden]);
   EXPECT_FALSE([followingSeparator isHidden]);
 }
 
 // If there's a non-separator item after the signin menu item, it should not
 // change state when the signin menu item is hidden/shown.
 TEST_F(BrowserWindowControllerTest, TestSigninMenuItemWithNonSeparator) {
-  scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@""]);
+  base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@""]);
   NSMenuItem* signinMenuItem =
       [menu addItemWithTitle:@""
                       action:@selector(commandDispatch)
                keyEquivalent:@""];
   [signinMenuItem setTag:IDC_SHOW_SYNC_SETUP];
   NSMenuItem* followingNonSeparator =
       [menu addItemWithTitle:@""
                       action:@selector(commandDispatch)
                keyEquivalent:@""];
   [signinMenuItem setHidden:NO];
@@ skipping 29 matching lines @@
   NSPoint point = [bookmarkView convertPoint:NSMakePoint(1, 1)
                                       toView:[contentView superview]];
 
   EXPECT_TRUE([[contentView hitTest:point] isDescendantOf:bookmarkView]);
 }
 
 @interface BrowserWindowControllerFakeFullscreen : BrowserWindowController {
  @private
   // We release the window ourselves, so we don't have to rely on the unittest
   // doing it for us.
-  scoped_nsobject<NSWindow> testFullscreenWindow_;
+  base::scoped_nsobject<NSWindow> testFullscreenWindow_;
 }
 @end
 
 class BrowserWindowFullScreenControllerTest : public CocoaProfileTest {
  public:
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
     controller_ =
@@ skipping 76 matching lines @@
   testFullscreenWindow_.reset(
       [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400)
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
   return testFullscreenWindow_.get();
 }
 @end
 
 /* TODO(???): test other methods of BrowserWindowController */