mac: Update clients of scoped_nsobject.h.

content/shell/shell_mac.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.
 
 #include "content/shell/shell.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/sys_string_conversions.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/shell/app/resource.h"
 #include "googleurl/src/gurl.h"
 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
 
 #if !defined(MAC_OS_X_VERSION_10_7) || \
@@ skipping 78 matching lines @@
 const CGFloat kMinimumWindowWidth = 400;
 const CGFloat kMinimumWindowHeight = 300;
 
 void MakeShellButton(NSRect* rect,
                      NSString* title,
                      NSView* parent,
                      int control,
                      NSView* target,
                      NSString* key,
                      NSUInteger modifier) {
-  scoped_nsobject<NSButton> button([[NSButton alloc] initWithFrame:*rect]);
+  base::scoped_nsobject<NSButton> button(
+      [[NSButton alloc] initWithFrame:*rect]);
   [button setTitle:title];
   [button setBezelStyle:NSSmallSquareBezelStyle];
   [button setAutoresizingMask:(NSViewMaxXMargin | NSViewMinYMargin)];
   [button setTarget:target];
   [button setAction:@selector(performAction:)];
   [button setTag:control];
   [button setKeyEquivalent:key];
   [button setKeyEquivalentModifierMask:modifier];
   [parent addSubview:button];
   rect->origin.x += kButtonWidth;
@@ skipping 95 matching lines @@
                   (NSView*)delegate, @"[", NSCommandKeyMask);
   MakeShellButton(&button_frame, @"Forward", content, IDC_NAV_FORWARD,
                   (NSView*)delegate, @"]", NSCommandKeyMask);
   MakeShellButton(&button_frame, @"Reload", content, IDC_NAV_RELOAD,
                   (NSView*)delegate, @"r", NSCommandKeyMask);
   MakeShellButton(&button_frame, @"Stop", content, IDC_NAV_STOP,
                   (NSView*)delegate, @".", NSCommandKeyMask);
 
   button_frame.size.width =
       NSWidth(initial_window_bounds) - NSMinX(button_frame);
-  scoped_nsobject<NSTextField> url_edit_view(
+  base::scoped_nsobject<NSTextField> url_edit_view(
       [[NSTextField alloc] initWithFrame:button_frame]);
   [content addSubview:url_edit_view];
   [url_edit_view setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];
   [url_edit_view setTarget:delegate];
   [url_edit_view setAction:@selector(takeURLStringValueFrom:)];
   [[url_edit_view cell] setWraps:NO];
   [[url_edit_view cell] setScrollable:YES];
   url_edit_view_ = url_edit_view.get();
 
   // show the window
@@ skipping 78 matching lines @@
         [[event.os_event characters] isEqual:@"l"]) {
       [window_ makeFirstResponder:url_edit_view_];
       return;
     }
 
     [[NSApp mainMenu] performKeyEquivalent:event.os_event];
   }
 }
 
 }  // namespace content