summaryrefslogtreecommitdiffstats
path: root/content/worker/websharedworker_stub.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/worker/websharedworker_stub.cc')
-rw-r--r--content/worker/websharedworker_stub.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc
index 2a551f3..d77db25 100644
--- a/content/worker/websharedworker_stub.cc
+++ b/content/worker/websharedworker_stub.cc
@@ -19,7 +19,7 @@
namespace content {
WebSharedWorkerStub::WebSharedWorkerStub(
- const string16& name,
+ const base::string16& name,
int route_id,
const WorkerAppCacheInitInfo& appcache_init_info)
: route_id_(route_id),
@@ -81,8 +81,9 @@ const GURL& WebSharedWorkerStub::url() {
}
void WebSharedWorkerStub::OnStartWorkerContext(
- const GURL& url, const string16& user_agent, const string16& source_code,
- const string16& content_security_policy,
+ const GURL& url, const base::string16& user_agent,
+ const base::string16& source_code,
+ const base::string16& content_security_policy,
blink::WebContentSecurityPolicyType policy_type) {
// Ignore multiple attempts to start this worker (can happen if two pages
// try to start it simultaneously).