Prefix string16 with base:: in ui/.

ui/app_list/views/apps_grid_view_unittest.cc

Index: ui/app_list/views/apps_grid_view_unittest.cc
diff --git a/ui/app_list/views/apps_grid_view_unittest.cc b/ui/app_list/views/apps_grid_view_unittest.cc
index b47731dc882338fb840e4c7216bf2ac1093ce27c..f2e94502a49be6fc33ced992fbd577c6a0c3bf1f 100644
--- a/ui/app_list/views/apps_grid_view_unittest.cc
+++ b/ui/app_list/views/apps_grid_view_unittest.cc
@@ -435,7 +435,7 @@ TEST_F(AppsGridViewTest, ItemLabelShortNameOverride) {
   std::string expected_tooltip("tooltip");
   model_->CreateAndAddItem(expected_text, expected_tooltip);
 
-  string16 actual_tooltip;
+  base::string16 actual_tooltip;
   AppListItemView* item_view = GetItemViewAt(0);
   ASSERT_TRUE(item_view);
   const views::Label* title_label = item_view->title();
@@ -451,7 +451,7 @@ TEST_F(AppsGridViewTest, ItemLabelNoShortName) {
   std::string title("a");
   model_->CreateAndAddItem(title, title);
 
-  string16 actual_tooltip;
+  base::string16 actual_tooltip;
   AppListItemView* item_view = GetItemViewAt(0);
   ASSERT_TRUE(item_view);
   const views::Label* title_label = item_view->title();