mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/login_prompt_cocoa.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/login_prompt_cocoa.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
 #include "chrome/browser/ui/login/login_model.h"
 #include "chrome/browser/ui/login/login_prompt.h"
@@ skipping 46 matching lines @@
     [sheet_controller_ setExplanation:base::SysUTF16ToNSString(explanation)];
 
     // Scary thread safety note: This can potentially be called *after* SetAuth
     // or CancelAuth (say, if the request was cancelled before the UI thread got
     // control).  However, that's OK since any UI interaction in those functions
     // will occur via an InvokeLater on the UI thread, which is guaranteed
     // to happen after this is called (since this was InvokeLater'd first).
     WebContents* requesting_contents = GetWebContentsForLogin();
     DCHECK(requesting_contents);
 
-    scoped_nsobject<CustomConstrainedWindowSheet> sheet(
+    base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(
         [[CustomConstrainedWindowSheet alloc]
             initWithCustomWindow:[sheet_controller_ window]]);
     constrained_window_.reset(new ConstrainedWindowMac(
         this, requesting_contents, sheet));
 
     NotifyAuthNeeded();
   }
 
   virtual void CloseDialog() OVERRIDE {
     // The hosting dialog may have been freed.
@@ skipping 27 matching lines @@
   friend class LoginPrompt;
 
   virtual ~LoginHandlerMac() {
     // This class will be deleted on a non UI thread. Ensure that the UI members
     // have already been deleted.
     CHECK(!constrained_window_.get());
     CHECK(!sheet_controller_.get());
   }
 
   // The Cocoa controller of the GUI.
-  scoped_nsobject<LoginHandlerSheet> sheet_controller_;
+  base::scoped_nsobject<LoginHandlerSheet> sheet_controller_;
 
   scoped_ptr<ConstrainedWindowMac> constrained_window_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginHandlerMac);
 };
 
 // static
 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
                                    net::URLRequest* request) {
   return new LoginHandlerMac(auth_info, request);
@@ skipping 50 matching lines @@
   // Resize the text field.
   CGFloat windowDelta = [GTMUILocalizerAndLayoutTweaker
        sizeToFitFixedWidthTextField:explanationField_];
 
   NSRect newFrame = [[self window] frame];
   newFrame.size.height += windowDelta;
   [[self window] setFrame:newFrame display:NO];
 }
 
 @end