Prefix string16 with base:: in ui/.

ui/base/cocoa/menu_controller_unittest.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 <Cocoa/Cocoa.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 69 matching lines @@
 };
 
 // Just like Delegate, except the items are treated as "dynamic" so updates to
 // the label/icon in the model are reflected in the menu.
 class DynamicDelegate : public Delegate {
  public:
   DynamicDelegate() {}
   virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE {
     return true;
   }
-  virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE {
+  virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE {
     return label_;
   }
   virtual bool GetIconForCommandId(
       int command_id,
       gfx::Image* icon) const OVERRIDE {
     if (icon_.IsEmpty()) {
       return false;
     } else {
       *icon = icon_;
       return true;
     }
   }
-  void SetDynamicLabel(string16 label) { label_ = label; }
+  void SetDynamicLabel(base::string16 label) { label_ = label; }
   void SetDynamicIcon(const gfx::Image& icon) { icon_ = icon; }
 
  private:
-  string16 label_;
+  base::string16 label_;
   gfx::Image icon_;
 };
 
 // Menu model that returns a gfx::Font object for one of the items in the menu.
 class FontMenuModel : public SimpleMenuModel {
  public:
   FontMenuModel(SimpleMenuModel::Delegate* delegate,
                 const gfx::Font* font, int index)
       : SimpleMenuModel(delegate),
         font_(font),
@@ skipping 97 matching lines @@
   model.AddItem(1, ASCIIToUTF16("one"));
   model.AddItem(2, ASCIIToUTF16("two"));
   model.AddItem(3, ASCIIToUTF16("three"));
 
   // Menu should have an extra item inserted at position 0 that has an empty
   // title.
   base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:YES]);
   EXPECT_EQ([[menu menu] numberOfItems], 4);
   EXPECT_EQ(base::SysNSStringToUTF16([[[menu menu] itemAtIndex:0] title]),
-            string16());
+            base::string16());
 
   // Make sure the tags are still correct (the index no longer matches the tag).
   NSMenuItem* itemTwo = [[menu menu] itemAtIndex:2];
   EXPECT_EQ([itemTwo tag], 1);
 }
 
 TEST_F(MenuControllerTest, Execute) {
   Delegate delegate;
   SimpleMenuModel model(&delegate);
   model.AddItem(1, ASCIIToUTF16("one"));
@@ skipping 70 matching lines @@
   model.AddItem(4, ASCIIToUTF16("four"));
   EXPECT_EQ(3, [[menu menu] numberOfItems]);
 }
 
 // Test that menus with dynamic labels actually get updated.
 TEST_F(MenuControllerTest, Dynamic) {
   DynamicDelegate delegate;
 
   // Create a menu containing a single item whose label is "initial" and who has
   // no icon.
-  string16 initial = ASCIIToUTF16("initial");
+  base::string16 initial = ASCIIToUTF16("initial");
   delegate.SetDynamicLabel(initial);
   SimpleMenuModel model(&delegate);
   model.AddItem(1, ASCIIToUTF16("foo"));
   base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 1);
   // Validate() simulates opening the menu - the item label/icon should be
   // initialized after this so we can validate the menu contents.
   Validate(menu.get(), [menu menu]);
   NSMenuItem* item = [[menu menu] itemAtIndex:0];
   // Item should have the "initial" label and no icon.
   EXPECT_EQ(initial, base::SysNSStringToUTF16([item title]));
   EXPECT_EQ(nil, [item image]);
 
   // Now update the item to have a label of "second" and an icon.
-  string16 second = ASCIIToUTF16("second");
+  base::string16 second = ASCIIToUTF16("second");
   delegate.SetDynamicLabel(second);
   const gfx::Image& icon =
       ResourceBundle::GetSharedInstance().GetNativeImageNamed(IDR_THROBBER);
   delegate.SetDynamicIcon(icon);
   // Simulate opening the menu and validate that the item label + icon changes.
   Validate(menu.get(), [menu menu]);
   EXPECT_EQ(second, base::SysNSStringToUTF16([item title]));
   EXPECT_TRUE([item image] != nil);
 
   // Now get rid of the icon and make sure it goes away.
@@ skipping 47 matching lines @@
   // Pump the task that notifies the delegate.
   message_loop.RunUntilIdle();
 
   // Expect that the delegate got notified properly.
   EXPECT_TRUE(delegate.did_close_);
 }
 
 }  // namespace
 
 }  // namespace ui