summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjhawkins@google.com <jhawkins@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 18:25:45 +0000
committerjhawkins@google.com <jhawkins@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 18:25:45 +0000
commitd55194ca076df03e149b904b12f83baadad85a8e (patch)
tree5732658491a778651e02fcc17beb8655a1a7edf1 /webkit
parent5bc8fe91607f20f2d43dc461ca188dd07b55d435 (diff)
downloadchromium_src-d55194ca076df03e149b904b12f83baadad85a8e.zip
chromium_src-d55194ca076df03e149b904b12f83baadad85a8e.tar.gz
chromium_src-d55194ca076df03e149b904b12f83baadad85a8e.tar.bz2
win: string_util.h -> utf_string_conversions.h fix.
BUG=none TEST=none Review URL: http://codereview.chromium.org/830002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/default_plugin/plugin_database_handler.cc1
-rw-r--r--webkit/glue/plugins/plugin_stream.cc3
-rw-r--r--webkit/tools/test_shell/test_shell_win.cc2
-rw-r--r--webkit/tools/test_shell/test_webview_delegate_win.cc2
4 files changed, 5 insertions, 3 deletions
diff --git a/webkit/default_plugin/plugin_database_handler.cc b/webkit/default_plugin/plugin_database_handler.cc
index c597d5a..d35fdb1 100644
--- a/webkit/default_plugin/plugin_database_handler.cc
+++ b/webkit/default_plugin/plugin_database_handler.cc
@@ -16,6 +16,7 @@
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "webkit/default_plugin/plugin_impl.h"
#include "webkit/default_plugin/plugin_main.h"
diff --git a/webkit/glue/plugins/plugin_stream.cc b/webkit/glue/plugins/plugin_stream.cc
index 6acfb7c..728b180 100644
--- a/webkit/glue/plugins/plugin_stream.cc
+++ b/webkit/glue/plugins/plugin_stream.cc
@@ -8,8 +8,9 @@
#include "webkit/glue/plugins/plugin_stream.h"
-#include "base/string_util.h"
#include "base/message_loop.h"
+#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "net/base/mime_util.h"
#include "webkit/glue/plugins/plugin_instance.h"
#include "googleurl/src/gurl.h"
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 0e4e6c1..8ce1bcb 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -19,8 +19,8 @@
#include "base/resource_util.h"
#include "base/stack_container.h"
#include "base/string_piece.h"
-#include "base/string_util.h"
#include "base/trace_event.h"
+#include "base/utf_string_conversions.h"
#include "base/win_util.h"
#include "breakpad/src/client/windows/handler/exception_handler.h"
#include "grit/webkit_resources.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index 8fef1d1..11c8732 100644
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -16,8 +16,8 @@
#include "app/gfx/native_widget_types.h"
#include "base/gfx/point.h"
#include "base/message_loop.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/WebCursorInfo.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"