chromeos: string_util.h -> utf_string_conversions.h fix.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/851010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41539 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 21 insertions, 12 deletions

diff --git a/views/controls/button/native_button_gtk.cc b/views/controls/button/native_button_gtk.cc
index c42bfbf..1fc7fac 100644
--- a/views/controls/button/native_button_gtk.cc
+++ b/views/controls/button/native_button_gtk.cc
@@ -1,13 +1,15 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
+// 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 "views/controls/button/native_button_gtk.h"
+
 #include <gtk/gtk.h>
 
-#include "views/controls/button/native_button_gtk.h"
+#include <vector>
 
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/button/radio_button.h"
diff --git a/views/controls/combobox/native_combobox_gtk.cc b/views/controls/combobox/native_combobox_gtk.cc
index 581fea3..fd0526a 100644
--- a/views/controls/combobox/native_combobox_gtk.cc
+++ b/views/controls/combobox/native_combobox_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
+// 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.
 
@@ -6,9 +6,11 @@
 
 #include <gtk/gtk.h>
 
+#include <algorithm>
+
 #include "app/combobox_model.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "views/controls/combobox/combobox.h"
 
 namespace views {
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index 138709b..b222229 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -4,6 +4,7 @@
 
 #include "views/controls/menu/native_menu_gtk.h"
 
+#include <algorithm>
 #include <map>
 #include <string>
 
@@ -14,8 +15,8 @@
 #include "base/keyboard_code_conversion_gtk.h"
 #include "base/keyboard_codes.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
 #include "base/time.h"
+#include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index ffdeb5e..0d20c03 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
@@ -12,7 +12,7 @@
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "views/background.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/fill_layout.h"
diff --git a/views/controls/table/native_table_gtk.cc b/views/controls/table/native_table_gtk.cc
index ebacb22..ca8813b 100644
--- a/views/controls/table/native_table_gtk.cc
+++ b/views/controls/table/native_table_gtk.cc
@@ -1,11 +1,13 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
+// 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 "views/controls/table/native_table_gtk.h"
 
+#include <string>
+
 #include "app/gfx/gtk_util.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/controls/table/table_view2.h"
 #include "views/controls/table/table_view_observer.h"
@@ -270,8 +272,8 @@ void NativeTableGtk::InsertIconAndTextColumn(const TableColumn& column,
                                              int index) {
   // If necessary we could support more than 1 icon and text column and we could
   // make it so it does not have to be the 1st column.
-  DCHECK(index == 0) << "The icon and text column can only be the first column "
-      "at this point.";
+  DCHECK_EQ(0, index) << "The icon and text column can only be the first column"
+      " at this point.";
 
   GtkTreeViewColumn* gtk_column = gtk_tree_view_column_new();
   gtk_tree_view_column_set_title(gtk_column, WideToUTF8(column.title).c_str());
diff --git a/views/controls/table/table_view_unittest.cc b/views/controls/table/table_view_unittest.cc
index 761ae02..3f87b32 100644
--- a/views/controls/table/table_view_unittest.cc
+++ b/views/controls/table/table_view_unittest.cc
@@ -8,6 +8,7 @@
 #include "app/table_model_observer.h"
 #include "base/message_loop.h"
 #include "base/string_util.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"
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index e3732b5..9baa017 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -9,7 +9,8 @@
 #include "app/gfx/insets.h"
 #include "app/gfx/gtk_util.h"
 #include "app/gfx/skia_utils_gtk.h"
-#include "base/string_util.h"
+#include "base/logging.h"
+#include "base/utf_string_conversions.h"
 #include "views/controls/textfield/textfield.h"
 
 namespace views {