mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm

 // Copyright 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 "chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <cmath>
 
 #include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
@@ skipping 39 matching lines @@
       [[NSGraphicsContext currentContext] graphicsPort]);
   CGContextBeginTransparencyLayerWithRect(context, NSRectToCGRect(frame), 0);
   { // Draw text clipped to frame.
     gfx::ScopedNSGraphicsContextSaveGState scoped_state;
     [NSBezierPath clipRect:frame];
     [title drawAtPoint:frame.origin];
   }
 
   NSColor* color = [NSColor blackColor];
   NSColor* alpha_color = [color colorWithAlphaComponent:0.0];
-  scoped_nsobject<NSGradient> mask(
-      [[NSGradient alloc] initWithStartingColor:color
-                                    endingColor:alpha_color]);
+  base::scoped_nsobject<NSGradient> mask(
+      [[NSGradient alloc] initWithStartingColor:color endingColor:alpha_color]);
   // Draw the gradient mask.
   CGContextSetBlendMode(context, kCGBlendModeDestinationIn);
   [mask drawFromPoint:NSMakePoint(NSMaxX(frame) - gradient_width,
                                   NSMinY(frame))
               toPoint:NSMakePoint(NSMaxX(frame),
                                   NSMinY(frame))
               options:NSGradientDrawsBeforeStartingLocation];
   CGContextEndTransparencyLayer(context);
 }
 
 }  // namespace
 
 NSImage* DragImageForBookmark(NSImage* favicon, const string16& title) {
   // If no favicon, use a default.
   if (!favicon) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     favicon = rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToNSImage();
   }
 
   // If no title, just use icon.
   if (title.empty())
     return favicon;
   NSString* ns_title = base::SysUTF16ToNSString(title);
 
   // Set the look of the title.
   NSDictionary* attrs =
       [NSDictionary dictionaryWithObject:[NSFont systemFontOfSize:
                                            [NSFont smallSystemFontSize]]
                                   forKey:NSFontAttributeName];
-  scoped_nsobject<NSAttributedString> rich_title(
-      [[NSAttributedString alloc] initWithString:ns_title
-                                      attributes:attrs]);
+  base::scoped_nsobject<NSAttributedString> rich_title(
+      [[NSAttributedString alloc] initWithString:ns_title attributes:attrs]);
 
   // Set up sizes and locations for rendering.
   const CGFloat kIconMargin = 2.0;  // Gap between icon and text.
   CGFloat text_left = [favicon size].width + kIconMargin;
   NSSize drag_image_size = [favicon size];
   NSSize text_size = [rich_title size];
   CGFloat max_text_width = bookmarks::kDefaultBookmarkWidth - text_left;
   text_size.width = std::min(text_size.width, max_text_width);
   drag_image_size.width = text_left + text_size.width;
 
@@ skipping 59 matching lines @@
              offset:NSZeroSize
               event:drag_event
          pasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]
              source:nil
           slideBack:YES];
 
   base::MessageLoop::current()->SetNestableTasksAllowed(was_nested);
 }
 
 }  // namespace chrome