Remove unnecessary references to webkit/glue/glue_util.h in

preparation for deleting that file.

R=dglazkov
BUG=24607
TEST=none

Review URL: http://codereview.chromium.org/551012

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

20 files changed, 13 insertions, 39 deletions

diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc
index 11211fd..5d5373a 100644
--- a/chrome/renderer/devtools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -13,7 +13,6 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "webkit/glue/devtools/devtools_message_data.h"
-#include "webkit/glue/glue_util.h"
 
 using WebKit::WebDevToolsAgent;
 using WebKit::WebPoint;
@@ -125,11 +124,8 @@ void DevToolsAgent::OnInspectElement(int x, int y) {
 
 void DevToolsAgent::OnSetApuAgentEnabled(bool enabled) {
   WebDevToolsAgent* web_agent = GetWebAgent();
-  if (web_agent) {
-    web_agent->setRuntimeFeatureEnabled(
-        webkit_glue::StdStringToWebString("apu-agent"),
-        enabled);
-  }
+  if (web_agent)
+    web_agent->setRuntimeFeatureEnabled("apu-agent", enabled);
 }
 
 WebDevToolsAgent* DevToolsAgent::GetWebAgent() {
@@ -142,5 +138,5 @@ WebDevToolsAgent* DevToolsAgent::GetWebAgent() {
 // static
 void WebKit::WebDevToolsAgentClient::sendMessageToFrontendOnIOThread(
     const WebDevToolsMessageData& data) {
-    DevToolsAgentFilter::SendRpcMessage(DevToolsMessageData(data));
+  DevToolsAgentFilter::SendRpcMessage(DevToolsMessageData(data));
 }
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 497f52f..ebc1cd6 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -97,7 +97,6 @@
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/glue/glue_serialize.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/image_decoder.h"
 #include "webkit/glue/media/buffered_data_source.h"
@@ -2093,7 +2092,7 @@ void RenderView::willSubmitForm(WebFrame* frame, const WebFormElement& form) {
   WebSearchableFormData web_searchable_form_data(form);
   navigation_state->set_searchable_form_url(web_searchable_form_data.url());
   navigation_state->set_searchable_form_encoding(
-      webkit_glue::WebStringToStdString(web_searchable_form_data.encoding()));
+      web_searchable_form_data.encoding().utf8());
   navigation_state->set_password_form_data(
       PasswordFormDomManager::CreatePasswordForm(form));
 
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 2dcf582..8d20ee5 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -30,7 +30,6 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_LINUX)
@@ -83,14 +82,14 @@ bool RendererWebKitClientImpl::sandboxEnabled() {
 
 bool RendererWebKitClientImpl::getFileSize(const WebString& path,
                                            long long& result) {
-  if (RenderThread::current()->Send(new ViewHostMsg_GetFileSize(
-      FilePath(webkit_glue::WebStringToFilePathString(path)),
-      reinterpret_cast<int64*>(&result)))) {
+  if (RenderThread::current()->Send(
+          new ViewHostMsg_GetFileSize(webkit_glue::WebStringToFilePath(path),
+                                      reinterpret_cast<int64*>(&result)))) {
     return result >= 0;
-  } else {
-    result = -1;
-    return false;
   }
+
+  result = -1;
+  return false;
 }
 
 unsigned long long RendererWebKitClientImpl::visitedLinkHash(
@@ -387,8 +386,8 @@ WebKit::WebString RendererWebKitClientImpl::signedPublicKeyAndChallengeString(
   std::string signed_public_key;
   RenderThread::current()->Send(new ViewHostMsg_Keygen(
       static_cast<uint32>(key_size_index),
-      webkit_glue::WebStringToStdString(challenge),
+      challenge.utf8(),
       GURL(url),
       &signed_public_key));
-  return webkit_glue::StdStringToWebString(signed_public_key);
+  return WebString::fromUTF8(signed_public_key);
 }
diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc
index c5e93ad..77c9146 100644
--- a/chrome/renderer/webplugin_delegate_pepper.cc
+++ b/chrome/renderer/webplugin_delegate_pepper.cc
@@ -21,7 +21,6 @@
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "third_party/npapi/bindings/npapi_extensions.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
diff --git a/chrome/worker/nativewebworker_impl.cc b/chrome/worker/nativewebworker_impl.cc
index d647086..bd3a993 100644
--- a/chrome/worker/nativewebworker_impl.cc
+++ b/chrome/worker/nativewebworker_impl.cc
@@ -9,7 +9,6 @@
 #undef LOG
 
 #include "base/logging.h"
-#include "webkit/glue/glue_util.h"
 #include "base/thread.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
diff --git a/webkit/glue/devtools/debugger_agent_impl.cc b/webkit/glue/devtools/debugger_agent_impl.cc
index 0b0cb19..dcac55a 100644
--- a/webkit/glue/devtools/debugger_agent_impl.cc
+++ b/webkit/glue/devtools/debugger_agent_impl.cc
@@ -21,7 +21,6 @@
 #include "third_party/WebKit/WebKit/chromium/src/WebViewImpl.h"
 #include "webkit/glue/devtools/debugger_agent_impl.h"
 #include "webkit/glue/devtools/debugger_agent_manager.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
 #include "webkit/glue/webkit_glue.h"
 
diff --git a/webkit/glue/devtools/devtools_rpc_js.h b/webkit/glue/devtools/devtools_rpc_js.h
index f6761c7..39362a3 100644
--- a/webkit/glue/devtools/devtools_rpc_js.h
+++ b/webkit/glue/devtools/devtools_rpc_js.h
@@ -14,7 +14,6 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "webkit/glue/devtools/bound_object.h"
 #include "webkit/glue/devtools/devtools_rpc.h"
-#include "webkit/glue/glue_util.h"
 
 ///////////////////////////////////////////////////////
 // JS RPC binds and stubs
diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc
index 6eb719a5..ecc1407 100644
--- a/webkit/glue/dom_operations.cc
+++ b/webkit/glue/dom_operations.cc
@@ -19,7 +19,6 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/form_data.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/webpasswordautocompletelistener_impl.h"
 
 using WebKit::WebAnimationController;
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index 200858b..544597b 100644
--- a/webkit/glue/plugins/plugin_host.cc
+++ b/webkit/glue/plugins/plugin_host.cc
@@ -13,7 +13,6 @@
 #include "net/base/net_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/webplugininfo.h"
 #include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/webkit/glue/plugins/plugin_instance.cc b/webkit/glue/plugins/plugin_instance.cc
index 6ae7328..d560d42 100644
--- a/webkit/glue/plugins/plugin_instance.cc
+++ b/webkit/glue/plugins/plugin_instance.cc
@@ -9,7 +9,6 @@
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/webplugin.h"
 #include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/webkit/glue/plugins/plugin_stream_url.cc b/webkit/glue/plugins/plugin_stream_url.cc
index 3362b9e..38f7edd 100644
--- a/webkit/glue/plugins/plugin_stream_url.cc
+++ b/webkit/glue/plugins/plugin_stream_url.cc
@@ -4,7 +4,6 @@
 
 #include "webkit/glue/plugins/plugin_stream_url.h"
 
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/plugin_host.h"
 #include "webkit/glue/plugins/plugin_instance.h"
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.cc b/webkit/glue/plugins/webplugin_delegate_impl.cc
index ecd478f..4d3b43c 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl.cc
@@ -14,7 +14,6 @@
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
index a7d781f..258193c 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
@@ -20,7 +20,6 @@
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/gtk_plugin_container.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
index 82c79a4..33b8c3c 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
+++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
@@ -18,7 +18,6 @@
 #include "base/string_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "webkit/default_plugin/plugin_impl.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/coregraphics_private_symbols_mac.h"
 #include "webkit/glue/plugins/fake_plugin_window_tracker_mac.h"
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
index b3eb3fc..ff6cf7c 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
@@ -19,7 +19,6 @@
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "webkit/default_plugin/plugin_impl.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 5a35903..c24dfac 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -39,7 +39,6 @@
 #include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h"
 #endif
 #include "webkit/glue/glue_serialize.h"
-#include "webkit/glue/glue_util.h"
 #include "v8/include/v8.h"
 
 #include "webkit_version.h"  // Generated
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index f6b7952..e33384d 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -25,7 +25,6 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugininfo.h"
diff --git a/webkit/tools/test_shell/accessibility_ui_element.cc b/webkit/tools/test_shell/accessibility_ui_element.cc
index 8ee65e9..ed23132 100644
--- a/webkit/tools/test_shell/accessibility_ui_element.cc
+++ b/webkit/tools/test_shell/accessibility_ui_element.cc
@@ -5,7 +5,6 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/tools/test_shell/accessibility_ui_element.h"
 
 using WebKit::WebCString;
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc
index 75e2b3c..dd04b2e 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc
@@ -11,7 +11,6 @@
 #include "webkit/tools/test_shell/test_shell_devtools_client.h"
 
 #include "base/message_loop.h"
-#include "webkit/glue/glue_util.h"
 
 using WebKit::WebDevToolsAgent;
 using WebKit::WebDevToolsMessageData;
@@ -113,8 +112,7 @@ bool TestShellDevToolsAgent::evaluateInWebInspector(
   WebDevToolsAgent* agent = GetWebAgent();
   if (!agent)
     return false;
-  agent->evaluateInWebInspector(call_id,
-                                webkit_glue::StdStringToWebString(script));
+  agent->evaluateInWebInspector(call_id, WebString::fromUTF8(script));
   return true;
 }
 
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 7ca9ac0..357df5b 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -39,7 +39,6 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/glue/glue_serialize.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/media/buffered_data_source.h"
 #include "webkit/glue/media/media_resource_loader_bridge_factory.h"
 #include "webkit/glue/media/simple_data_source.h"
@@ -99,8 +98,6 @@ using WebKit::WebWorker;
 using WebKit::WebWorkerClient;
 using WebKit::WebView;
 
-using webkit_glue::AccessibilityObjectToWebAccessibilityObject;
-
 namespace {
 
 // WebNavigationType debugging strings taken from PolicyDelegate.mm.