1 files changed, 8 insertions, 6 deletions
diff --git a/chromium/ui/views/examples/table_example.cc b/chromium/ui/views/examples/table_example.cc
index 87032c7160a..5c9eebfd2ed 100644
--- a/chromium/ui/views/examples/table_example.cc
+++ b/chromium/ui/views/examples/table_example.cc
@@ -14,6 +14,8 @@
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/layout/grid_layout.h"
 
+using base::ASCIIToUTF16;
+
 namespace views {
 namespace examples {
 
@@ -107,9 +109,9 @@ int TableExample::RowCount() {
   return 10;
 }
 
-string16 TableExample::GetText(int row, int column_id) {
+base::string16 TableExample::GetText(int row, int column_id) {
   if (row == -1)
-    return string16();
+    return base::string16();
 
   const char* const cells[5][4] = {
     { "Orange", "Orange", "South america", "$5" },
@@ -143,14 +145,14 @@ void TableExample::GetGroupRange(int model_index, GroupRange* range) {
 
 void TableExample::OnSelectionChanged() {
   PrintStatus("Selected: %s",
-              UTF16ToASCII(GetText(table_->selection_model().active(),
-                                   0)).c_str());
+              base::UTF16ToASCII(GetText(table_->selection_model().active(),
+                                         0)).c_str());
 }
 
 void TableExample::OnDoubleClick() {
   PrintStatus("Double Click: %s",
-              UTF16ToASCII(GetText(table_->selection_model().active(),
-                                   0)).c_str());
+              base::UTF16ToASCII(GetText(table_->selection_model().active(),
+                                         0)).c_str());
 }
 
 void TableExample::OnMiddleClick() {}