summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-06 22:18:07 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-06 22:18:07 +0000
commit35d10decf89ee2c25d353fb5bcb0766f2542353a (patch)
tree13823724976e37250c2ef1c7bed13f253cdf8698 /webkit
parentc7892f03448cb367ce90a1592d55a6996814fb1d (diff)
downloadchromium_src-35d10decf89ee2c25d353fb5bcb0766f2542353a.zip
chromium_src-35d10decf89ee2c25d353fb5bcb0766f2542353a.tar.gz
chromium_src-35d10decf89ee2c25d353fb5bcb0766f2542353a.tar.bz2
webkit/tools: string_util.h -> utf_string_conversions.h fix.
BUG=none TEST=none Review URL: http://codereview.chromium.org/668228 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/event_sending_controller.cc3
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc2
-rw-r--r--webkit/tools/test_shell/mock_spellcheck_unittest.cc1
-rw-r--r--webkit/tools/test_shell/node_leak_test.cc2
-rw-r--r--webkit/tools/test_shell/test_shell.cc2
-rw-r--r--webkit/tools/test_shell/test_shell_gtk.cc2
-rw-r--r--webkit/tools/test_shell/test_shell_main.cc2
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc2
-rw-r--r--webkit/tools/test_shell/test_webview_delegate_gtk.cc2
9 files changed, 10 insertions, 8 deletions
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index fa8da24..a3b9773 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -24,8 +24,9 @@
#include "base/keyboard_codes.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/string_util.h"
#include "base/time.h"
+#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h"
#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index 337da70..3a5de05 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -13,7 +13,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
diff --git a/webkit/tools/test_shell/mock_spellcheck_unittest.cc b/webkit/tools/test_shell/mock_spellcheck_unittest.cc
index 76ac595..17912bb 100644
--- a/webkit/tools/test_shell/mock_spellcheck_unittest.cc
+++ b/webkit/tools/test_shell/mock_spellcheck_unittest.cc
@@ -4,6 +4,7 @@
#include "base/format_macros.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/tools/test_shell/mock_spellcheck.h"
diff --git a/webkit/tools/test_shell/node_leak_test.cc b/webkit/tools/test_shell/node_leak_test.cc
index ded1f03..40d19ff 100644
--- a/webkit/tools/test_shell/node_leak_test.cc
+++ b/webkit/tools/test_shell/node_leak_test.cc
@@ -5,7 +5,7 @@
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/http/http_cache.h"
#include "net/url_request/url_request_context.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index b4fcac8..533b87e 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -20,7 +20,7 @@
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/stats_table.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "build/build_config.h"
#include "googleurl/src/url_util.h"
#include "grit/webkit_strings.h"
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index e6673ff..bce9c31 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -18,7 +18,7 @@
#include "base/path_service.h"
#include "base/string16.h"
#include "base/string_piece.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "grit/test_shell_resources.h"
#include "grit/webkit_resources.h"
#include "net/base/mime_util.h"
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 7f48941..4fb0818 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -15,9 +15,9 @@
#include "base/process_util.h"
#include "base/rand_util.h"
#include "base/stats_table.h"
-#include "base/string_util.h"
#include "base/sys_info.h"
#include "base/trace_event.h"
+#include "base/utf_string_conversions.h"
#include "net/base/cookie_monster.h"
#include "net/base/net_module.h"
#include "net/base/net_util.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index ded3c1c..afe6cd5 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -13,8 +13,8 @@
#include "base/gfx/point.h"
#include "base/message_loop.h"
#include "base/process_util.h"
-#include "base/string_util.h"
#include "base/trace_event.h"
+#include "base/utf_string_conversions.h"
#include "net/base/net_errors.h"
#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h"
#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
index 9da1f69..6a33c50 100644
--- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
@@ -12,7 +12,7 @@
#include "app/gfx/gtk_util.h"
#include "base/gfx/point.h"
#include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/net_errors.h"
#include "chrome/common/page_transition_types.h"
#include "third_party/WebKit/WebKit/chromium/public/WebCString.h"