Remove 'using base::string16;' from base/strings/string16.h and remove temporary

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/mac/scoped_nsobject.h"
@@ skipping 17 matching lines @@
   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 base::string16&)title
-                   toWidth:(int)width;
++ (base::string16)elideMenuTitle:(const base::string16&)title
+                         toWidth:(int)width;
 
 // NIB-based initializer. This does not create a menu. Clients can set the
 // properties of the object and the menu will be created upon the first call to
 // |-menu|. Note that the menu will be immutable after creation.
 - (id)init;
 
 // Builds a NSMenu from the pre-built model (must not be nil). Changes made
 // to the contents of the model after calling this will not be noticed. If
 // the menu will be displayed by a NSPopUpButtonCell, it needs to be of a
 // slightly different form (0th item is empty). Note this attribute of the menu
@@ skipping 29 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_