mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.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/autofill/autofill_suggestion_container.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/chrome_style.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #include "skia/ext/skia_utils_mac.h"
 
 namespace {
 
 // Horizontal padding between text and other elements (in pixels).
 const int kAroundTextPadding = 4;
 
 // Vertical padding between individual elements.
 const int kVerticalPadding = 8;
 
 // Centers |rect2| vertically in |rect1|, on an integral y coordinate.
 // Assumes |rect1| has integral origin coordinates.
 NSRect CenterVertically(NSRect rect1, NSRect rect2) {
   DCHECK_LE(NSHeight(rect2), NSHeight(rect1));
   CGFloat offset = (NSHeight(rect1) - NSHeight(rect2)) / 2.0;
   rect2.origin.y = std::floor(rect1.origin.y + offset);
   return rect2;
 }
 
 }
 
 @implementation AutofillSuggestionContainer
 
 - (NSTextField*)makeDetailSectionLabel:(NSString*)labelText {
-  scoped_nsobject<NSTextField> label([[NSTextField alloc] init]);
+  base::scoped_nsobject<NSTextField> label([[NSTextField alloc] init]);
   [label setFont:
       [[NSFontManager sharedFontManager] convertFont:[label font]
                                          toHaveTrait:NSBoldFontMask]];
   [label setStringValue:labelText];
   [label setEditable:NO];
   [label setBordered:NO];
   [label sizeToFit];
   return label.autorelease();
 }
 
 - (void)loadView {
   label_.reset([[self createLabelWithFrame:NSZeroRect] retain]);
   label2_.reset([[self createLabelWithFrame:NSZeroRect] retain]);
 
   iconImageView_.reset([[NSImageView alloc] initWithFrame:NSZeroRect]);
   [iconImageView_ setImageFrameStyle:NSImageFrameNone];
   [iconImageView_ setHidden:YES];
 
   inputField_.reset([[AutofillTextField alloc] initWithFrame:NSZeroRect]);
   [inputField_ setHidden:YES];
 
-  scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
+  base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
   [view setSubviews:
       @[iconImageView_, label_, inputField_, label2_ ]];
   [self setView:view];
 }
 
 - (NSTextField*)createLabelWithFrame:(NSRect)frame {
-  scoped_nsobject<NSTextField> label(
+  base::scoped_nsobject<NSTextField> label(
       [[NSTextField alloc] initWithFrame:frame]);
   [label setEditable:NO];
   [label setDrawsBackground:NO];
   [label setBordered:NO];
   return label.autorelease();
 }
 
 // TODO(groby): Can we make all the individual setters private and just
 // update state as a whole?
 - (void)setIcon:(NSImage*)iconImage {
@@ skipping 86 matching lines @@
                  NSWidth(inputfieldFrame) + kAroundTextPadding, NSMaxXEdge);
   }
 
   [label_ setFrame:labelFrame];
   [label2_ setFrameOrigin:NSMakePoint(
           0,
           NSMinY(lineFrame) - kAroundTextPadding - NSHeight([label2_ frame]))];
   [[self view] setFrameSize:preferredContainerSize];
 }
 
-@end
+@end