| Index: chrome/renderer/chrome_content_renderer_client.cc
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
|
| index d331933591ecd13408dffa8143916bdd6856ca8d..3ab6a8b5d4e9ae878ea2866f51a68f8c1302437b 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -77,6 +77,7 @@
|
| #include "components/version_info/version_info.h"
|
| #include "components/visitedlink/renderer/visitedlink_slave.h"
|
| #include "components/web_cache/renderer/web_cache_render_process_observer.h"
|
| +#include "content/public/child/url_conversion.h"
|
| #include "content/public/common/content_constants.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/renderer/plugin_instance_throttler.h"
|
| @@ -556,8 +557,8 @@ bool ChromeContentRendererClient::OverrideCreatePlugin(
|
| ChromeViewHostMsg_GetPluginInfo_Output output;
|
| WebString top_origin = frame->top()->securityOrigin().toString();
|
| render_frame->Send(new ChromeViewHostMsg_GetPluginInfo(
|
| - render_frame->GetRoutingID(), url, GURL(top_origin), orig_mime_type,
|
| - &output));
|
| + render_frame->GetRoutingID(), url, content::WebStringToGURL(top_origin),
|
| + orig_mime_type, &output));
|
| *plugin = CreatePlugin(render_frame, frame, params, output);
|
| #else // !defined(ENABLE_PLUGINS)
|
|
|
|
|