mac: Update clients of scoped_nsobject.h.

ui/base/cocoa/menu_controller.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 "ui/base/cocoa/menu_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/platform_accelerator_cocoa.h"
@@ skipping 89 matching lines @@
 // associated with the entry in the model identified by |modelIndex|.
 - (void)addItemToMenu:(NSMenu*)menu
               atIndex:(NSInteger)index
             fromModel:(ui::MenuModel*)model {
   string16 label16 = model->GetLabelAt(index);
   int maxWidth = [self maxWidthForMenuModel:model modelIndex:index];
   if (maxWidth != -1)
     label16 = [MenuController elideMenuTitle:label16 toWidth:maxWidth];
 
   NSString* label = l10n_util::FixUpWindowsStyleLabel(label16);
-  scoped_nsobject<NSMenuItem> item(
+  base::scoped_nsobject<NSMenuItem> item(
       [[NSMenuItem alloc] initWithTitle:label
                                  action:@selector(itemSelected:)
                           keyEquivalent:@""]);
 
   // If the menu item has an icon, set it.
   gfx::Image icon;
   if (model->GetIconAt(index, &icon) && !icon.IsEmpty())
     [item setImage:icon.ToNSImage()];
 
   ui::MenuModel::ItemType type = model->GetTypeAt(index);
@@ skipping 56 matching lines @@
 
       gfx::Image icon;
       model->GetIconAt(modelIndex, &icon);
       [(id)item setImage:icon.IsEmpty() ? nil : icon.ToNSImage()];
     }
     const gfx::Font* font = model->GetLabelFontAt(modelIndex);
     if (font) {
       NSDictionary *attributes =
           [NSDictionary dictionaryWithObject:font->GetNativeFont()
                                       forKey:NSFontAttributeName];
-      scoped_nsobject<NSAttributedString> title(
+      base::scoped_nsobject<NSAttributedString> title(
           [[NSAttributedString alloc] initWithString:[(id)item title]

[Nico, 2013/06/25 01:09:50]

clang-format gets this right as of clang r184804.

                                           attributes:attributes]);
       [(id)item setAttributedTitle:title.get()];
     }
     return model->IsEnabledAt(modelIndex);
   }
   return NO;
 }
 
 // Called when the user chooses a particular menu item. |sender| is the menu
 // item chosen.
@@ skipping 11 matching lines @@
 
 - (NSMenu*)menu {
   if (!menu_ && model_) {
     menu_.reset([[self menuFromModel:model_] retain]);
     [menu_ setDelegate:self];
     // If this is to be used with a NSPopUpButtonCell, add an item at the 0th
     // position that's empty. Doing it after the menu has been constructed won't
     // complicate creation logic, and since the tags are model indexes, they
     // are unaffected by the extra item.
     if (useWithPopUpButtonCell_) {
-      scoped_nsobject<NSMenuItem> blankItem(
+      base::scoped_nsobject<NSMenuItem> blankItem(
           [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""]);
       [menu_ insertItem:blankItem atIndex:0];
     }
   }
   return menu_.get();
 }
 
 - (BOOL)isMenuOpen {
   return isMenuOpen_;
 }
 
 - (void)menuWillOpen:(NSMenu*)menu {
   isMenuOpen_ = YES;
   model_->MenuWillShow();
 }
 
 - (void)menuDidClose:(NSMenu*)menu {
   if (isMenuOpen_) {
     model_->MenuClosed();
     isMenuOpen_ = NO;
   }
 }
 
 @end