mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller_browsertest.mm

 // Copyright 2013 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/profile_signin_confirmation_view_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #import "testing/gtest_mac.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 42 matching lines @@
         IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_LEARN_MORE);
   }
 
   // ui::ProfileSigninConfirmationDelegate:
   virtual void OnContinueSignin() OVERRIDE { continued_ = true; }
   virtual void OnCancelSignin() OVERRIDE { cancelled_ = true; }
   virtual void OnSigninWithNewProfile() OVERRIDE { created_ = true; }
   void OnClose() { closed_ = true; }
 
   // The window containing the dialog.
-  scoped_nsobject<NSWindow> window_;
+  base::scoped_nsobject<NSWindow> window_;
 
   // Dialog under test.
-  scoped_nsobject<ProfileSigninConfirmationViewController> controller_;
+  base::scoped_nsobject<ProfileSigninConfirmationViewController> controller_;
 
   // Visible for testing UI interactions.
   bool continued_;
   bool cancelled_;
   bool created_;
   bool closed_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ProfileSigninConfirmationViewControllerTest);
 };
@@ skipping 91 matching lines @@
   EXPECT_NSNE(nil, [controller_ createProfileButton]);
   EXPECT_TRUE([[[controller_ view] subviews]
                 containsObject:[controller_ createProfileButton]]);
   NSString* explanationWithCreateProfile = base::SysUTF16ToNSString(
       l10n_util::GetStringFUTF16(
           IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION_NEW_STYLE,
           UTF8ToUTF16(username()), learn_more()));
   EXPECT_NSEQ(explanationWithCreateProfile,
               [[[controller_ explanationField] textStorage] string]);
 }