Index: content/child/blink_platform_impl.cc |
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc |
index a5fd1d2b60dcfced041d891d4b8e80c51f48e593..bb62a74337e43d1f8c286bb9d77113f09d537ca0 100644 |
--- a/content/child/blink_platform_impl.cc |
+++ b/content/child/blink_platform_impl.cc |
@@ -28,6 +28,7 @@ |
#include "base/time/time.h" |
#include "content/child/web_socket_stream_handle_impl.h" |
#include "content/child/web_url_loader_impl.h" |
+#include "content/public/common/user_agent.h" |
#include "grit/blink_resources.h" |
#include "grit/webkit_resources.h" |
#include "grit/webkit_strings.h" |
@@ -38,7 +39,6 @@ |
#include "third_party/WebKit/public/platform/WebString.h" |
#include "ui/base/layout.h" |
#include "webkit/child/webkit_child_helpers.h" |
-#include "webkit/common/user_agent/user_agent.h" |
#if defined(OS_ANDROID) |
#include "base/android/sys_utils.h" |
@@ -363,13 +363,12 @@ WebSocketStreamHandle* BlinkPlatformImpl::createSocketStreamHandle() { |
} |
WebString BlinkPlatformImpl::userAgent(const WebURL& url) { |
- return WebString::fromUTF8(webkit_glue::GetUserAgent(url)); |
+ return WebString::fromUTF8(GetUserAgent(url)); |
} |
-WebData BlinkPlatformImpl::parseDataURL( |
- const WebURL& url, |
- WebString& mimetype_out, |
- WebString& charset_out) { |
+WebData BlinkPlatformImpl::parseDataURL(const WebURL& url, |
+ WebString& mimetype_out, |
+ WebString& charset_out) { |
std::string mime_type, char_set, data; |
if (net::DataURL::Parse(url, &mime_type, &char_set, &data) |
&& net::IsSupportedMimeType(mime_type)) { |