mac: Update clients of scoped_nsobject.h.

ui/base/cocoa/menu_controller.h

 // 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.
 
 #ifndef UI_BASE_COCOA_MENU_CONTROLLER_H_
 #define UI_BASE_COCOA_MENU_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "ui/base/ui_export.h"
 
 namespace ui {
 class MenuModel;
 }
 
 // A controller for the cross-platform menu model. The menu that's created
 // has the tag and represented object set for each menu item. The object is a
 // NSValue holding a pointer to the model for that level of the menu (to
 // allow for hierarchical menus). The tag is the index into that model for
 // that particular item. It is important that the model outlives this object
 // as it only maintains weak references.
 UI_EXPORT
 @interface MenuController : NSObject<NSMenuDelegate> {
  @protected
   ui::MenuModel* model_;  // weak
-  scoped_nsobject<NSMenu> menu_;
+  base::scoped_nsobject<NSMenu> menu_;
   BOOL useWithPopUpButtonCell_;  // If YES, 0th item is blank
   BOOL isMenuOpen_;
 }
 
 @property(nonatomic, assign) ui::MenuModel* model;
 // Note that changing this will have no effect if you use
 // |-initWithModel:useWithPopUpButtonCell:| or after the first call to |-menu|.
 @property(nonatomic) BOOL useWithPopUpButtonCell;
 
 + (string16)elideMenuTitle:(const string16&)title
@@ skipping 40 matching lines @@
               atIndex:(NSInteger)index
             fromModel:(ui::MenuModel*)model;
 - (NSMenu*)menuFromModel:(ui::MenuModel*)model;
 // Returns the maximum width for the menu item. Returns -1 to indicate
 // that there's no maximum width.
 - (int)maxWidthForMenuModel:(ui::MenuModel*)model
                  modelIndex:(int)modelIndex;
 @end
 
 #endif  // UI_BASE_COCOA_MENU_CONTROLLER_H_