Prefix string16 with base:: in ui/.

ui/views/controls/scrollbar/base_scroll_bar.cc

Index: ui/views/controls/scrollbar/base_scroll_bar.cc
diff --git a/ui/views/controls/scrollbar/base_scroll_bar.cc b/ui/views/controls/scrollbar/base_scroll_bar.cc
index 6271c2e1bfe4a77fe7b8b0c46692fd63ee2b00ff..02f79dee59b8e1078b3e89317ad286e3c8411fce 100644
--- a/ui/views/controls/scrollbar/base_scroll_bar.cc
+++ b/ui/views/controls/scrollbar/base_scroll_bar.cc
@@ -305,7 +305,7 @@ void BaseScrollBar::ShowContextMenuForView(View* source,
 ///////////////////////////////////////////////////////////////////////////////
 // BaseScrollBar, Menu::Delegate implementation:
 
-string16 BaseScrollBar::GetLabel(int id) const {
+base::string16 BaseScrollBar::GetLabel(int id) const {
   int ids_value = 0;
   switch (id) {
     case ScrollBarContextMenuCommand_ScrollHere:
@@ -337,7 +337,7 @@ string16 BaseScrollBar::GetLabel(int id) const {
       NOTREACHED() << "Invalid BaseScrollBar Context Menu command!";
   }
 
-  return ids_value ? l10n_util::GetStringUTF16(ids_value) : string16();
+  return ids_value ? l10n_util::GetStringUTF16(ids_value) : base::string16();
 }
 
 bool BaseScrollBar::IsCommandEnabled(int id) const {