summaryrefslogtreecommitdiffstats
path: root/content/renderer/websharedworker_proxy.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 20:11:26 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 20:11:26 +0000
commitfcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch)
treed41b14e6526a822b66d692f60dc8f648a2afb3cd /content/renderer/websharedworker_proxy.cc
parent426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff)
downloadchromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.zip
chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.gz
chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.bz2
Convert string16 to base::string16 in content.
BUG= Review URL: https://codereview.chromium.org/102593002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/websharedworker_proxy.cc')
-rw-r--r--content/renderer/websharedworker_proxy.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/renderer/websharedworker_proxy.cc b/content/renderer/websharedworker_proxy.cc
index ad35f02..9b5edc5 100644
--- a/content/renderer/websharedworker_proxy.cc
+++ b/content/renderer/websharedworker_proxy.cc
@@ -51,10 +51,10 @@ void WebSharedWorkerProxy::Disconnect() {
void WebSharedWorkerProxy::CreateWorkerContext(
const GURL& script_url,
bool is_shared,
- const string16& name,
- const string16& user_agent,
- const string16& source_code,
- const string16& content_security_policy,
+ const base::string16& name,
+ const base::string16& user_agent,
+ const base::string16& source_code,
+ const base::string16& content_security_policy,
blink::WebContentSecurityPolicyType policy_type,
int pending_route_id,
int64 script_resource_appcache_id) {