mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h"
 
 #include "base/mac/bundle_locations.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/chrome_style.h"
-#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #include "chrome/browser/ui/chrome_style.h"
 #include "chrome/browser/ui/chrome_style.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_account_chooser.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_details_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_main_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.h"
+#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
 #import "ui/base/cocoa/flipped_view.h"
 #include "ui/base/cocoa/window_size_constants.h"
 
 namespace {
 
 const CGFloat kAccountChooserHeight = 20.0;
 const CGFloat kRelatedControlVerticalSpacing = 8.0;
 
@@ skipping 13 matching lines @@
 
 AutofillDialogCocoa::~AutofillDialogCocoa() {
 }
 
 void AutofillDialogCocoa::Show() {
   // This should only be called once.
   DCHECK(!sheet_controller_.get());
   sheet_controller_.reset([[AutofillDialogWindowController alloc]
        initWithWebContents:controller_->web_contents()
             autofillDialog:this]);
-  scoped_nsobject<CustomConstrainedWindowSheet> sheet(
+  base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(
       [[CustomConstrainedWindowSheet alloc]
           initWithCustomWindow:[sheet_controller_ window]]);
   constrained_window_.reset(
       new ConstrainedWindowMac(this, controller_->web_contents(), sheet));
 }
 
 // Closes the sheet and ends the modal loop. Triggers cleanup sequence.
 void AutofillDialogCocoa::Hide() {
   constrained_window_->CloseWebContentsModalDialog();
 }
@@ skipping 66 matching lines @@
 }  // autofill
 
 #pragma mark Window Controller
 
 @implementation AutofillDialogWindowController
 
 - (id)initWithWebContents:(content::WebContents*)webContents
       autofillDialog:(autofill::AutofillDialogCocoa*)autofillDialog {
   DCHECK(webContents);
 
-  scoped_nsobject<ConstrainedWindowCustomWindow> window(
+  base::scoped_nsobject<ConstrainedWindowCustomWindow> window(
       [[ConstrainedWindowCustomWindow alloc]
           initWithContentRect:ui::kWindowSizeDeterminedLater]);
 
   if ((self = [super initWithWindow:window])) {
     webContents_ = webContents;
     autofillDialog_ = autofillDialog;
 
     mainContainer_.reset([[AutofillMainContainer alloc]
                              initWithController:autofillDialog->controller()]);
     [mainContainer_ setTarget:self];
@@ skipping 12 matching lines @@
     NSRect headerRect = clientRect;
     headerRect.size.height = kAccountChooserHeight;
     headerRect.origin.y = NSMaxY(clientRect);
     accountChooser_.reset([[AutofillAccountChooser alloc]
                               initWithFrame:headerRect
                                  controller:autofillDialog->controller()]);
 
     // This needs a flipped content view because otherwise the size
     // animation looks odd. However, replacing the contentView for constrained
     // windows does not work - it does custom rendering.
-    scoped_nsobject<NSView> flippedContentView(
+    base::scoped_nsobject<NSView> flippedContentView(
         [[FlippedView alloc] initWithFrame:NSZeroRect]);
     [flippedContentView setSubviews:
         @[accountChooser_, [mainContainer_ view], [signInContainer_ view]]];
     [flippedContentView setAutoresizingMask:
         (NSViewWidthSizable | NSViewHeightSizable)];
     [[[self window] contentView] addSubview:flippedContentView];
 
     NSRect contentRect = clientRect;
     contentRect.origin = NSMakePoint(0, 0);
     contentRect.size.width += 2 * chrome_style::kHorizontalPadding;
@@ skipping 91 matching lines @@
   [[signInContainer_ view] setHidden:YES];
   [[mainContainer_ view] setHidden:NO];
   [self performLayout];
 }
 
 - (void)modelChanged {
   [mainContainer_ modelChanged];
 }
 
 @end