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

4 files changed, 12 insertions, 19 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"