Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / android_webview / renderer / aw_content_renderer_client.cc

diff --git a/src/android_webview/renderer/aw_content_renderer_client.cc b/src/android_webview/renderer/aw_content_renderer_client.cc
index caa372d..5114d0f 100644 (file)
--- a/src/android_webview/renderer/aw_content_renderer_client.cc
+++ b/src/android_webview/renderer/aw_content_renderer_client.cc
@@ -147,10 +147,6 @@ void AwContentRendererClient::RenderViewCreated(
   new autofill::AutofillAgent(render_view, password_autofill_agent, NULL);
 }
 
-std::string AwContentRendererClient::GetDefaultEncoding() {
-  return AwResource::GetDefaultTextEncoding();
-}
-
 bool AwContentRendererClient::HasErrorPage(int http_status_code,
                           std::string* error_domain) {
   return http_status_code >= 400;
@@ -197,7 +193,7 @@ bool AwContentRendererClient::IsLinkVisited(unsigned long long link_hash) {
 }
 
 void AwContentRendererClient::AddKeySystems(
-    std::vector<content::KeySystemInfo>* key_systems) {
+    std::vector<media::KeySystemInfo>* key_systems) {
   AwAddKeySystems(key_systems);
 }