Remove wstring from TableModel....

views/controls/table/table_view_unittest.cc

 // Copyright (c) 2010 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.
 
 #include <vector>
 
 #include "app/table_model.h"
 #include "app/table_model_observer.h"
+#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/table/table_view2.h"
 #include "views/window/window_delegate.h"
 #if defined(OS_WIN)
 #include "views/window/window_win.h"
 #else
@@ skipping 21 matching lines @@
   // Adds a new row at index |row| with values |c1_value| and |c2_value|.
   void AddRow(int row, int c1_value, int c2_value);
 
   // Removes the row at index |row|.
   void RemoveRow(int row);
 
   // Changes the values of the row at |row|.
   void ChangeRow(int row, int c1_value, int c2_value);
 
   // TableModel
-  virtual int RowCount();
-  virtual std::wstring GetText(int row, int column_id);
-  virtual void SetObserver(TableModelObserver* observer);
-  virtual int CompareValues(int row1, int row2, int column_id);
+  virtual int RowCount() OVERRIDE;
+  virtual string16 GetText(int row, int column_id) OVERRIDE;
+  virtual void SetObserver(TableModelObserver* observer) OVERRIDE;
+  virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE;
 
  private:
   TableModelObserver* observer_;
 
   // The data.
   std::vector<std::vector<int> > rows_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTableModel);
 };
 
 // Same behavior as TestTableModel, except even items are in one group, while
 // odd items are put in a different group.
 class GroupTestTableModel : public TestTableModel {
   virtual bool HasGroups() { return true; }
 
   virtual Groups GetGroups() {
     Groups groups;
     Group group1, group2;
-    group1.title = L"Group 1";
+    group1.title = ASCIIToUTF16("Group 1");
     group1.id = 0;
-    group2.title = L"Group 2";
+    group2.title = ASCIIToUTF16("Group 2");
     group2.id = 0;
     groups.push_back(group1);
     groups.push_back(group2);
     return groups;
   }
 
   // Return group = 0 if row is even, otherwise group = 1.
   virtual int GetGroupID(int row) { return row % 2; }
 };
 
@@ skipping 24 matching lines @@
   rows_[row][0] = c1_value;
   rows_[row][1] = c2_value;
   if (observer_)
     observer_->OnItemsChanged(row, 1);
 }
 
 int TestTableModel::RowCount() {
   return static_cast<int>(rows_.size());
 }
 
-std::wstring TestTableModel::GetText(int row, int column_id) {
-  return UTF8ToWide(base::IntToString(rows_[row][column_id]));
+string16 TestTableModel::GetText(int row, int column_id) {
+  return UTF8ToUTF16(base::IntToString(rows_[row][column_id]));
 }
 
 void TestTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }
 
 int TestTableModel::CompareValues(int row1, int row2, int column_id) {
   return rows_[row1][column_id] - rows_[row2][column_id];
 }
 
@@ skipping 489 matching lines @@
 
   table_->FocusRow(2);
   EXPECT_EQ(2, table_->GetFirstFocusedRow());
 
   table_->ClearRowFocus();
   EXPECT_EQ(-1, table_->GetFirstSelectedRow());
 }
 #endif
 
 }  // namespace views