| Index: content/common/worker_messages.h
|
| diff --git a/content/common/worker_messages.h b/content/common/worker_messages.h
|
| index e50099d5a1c4d88751e4e043aa2f1a4cbe6dbc2d..6145f802b4e5dfc12a9fe89b8d6ce8e1a88d9adb 100644
|
| --- a/content/common/worker_messages.h
|
| +++ b/content/common/worker_messages.h
|
| @@ -31,15 +31,15 @@ IPC_STRUCT_BEGIN(WorkerHostMsg_PostConsoleMessageToWorkerObject_Params)
|
| IPC_STRUCT_MEMBER(int, source_identifier)
|
| IPC_STRUCT_MEMBER(int, message_type)
|
| IPC_STRUCT_MEMBER(int, message_level)
|
| - IPC_STRUCT_MEMBER(string16, message)
|
| + IPC_STRUCT_MEMBER(base::string16, message)
|
| IPC_STRUCT_MEMBER(int, line_number)
|
| - IPC_STRUCT_MEMBER(string16, source_url)
|
| + IPC_STRUCT_MEMBER(base::string16, source_url)
|
| IPC_STRUCT_END()
|
|
|
| // Parameter structure for WorkerProcessMsg_CreateWorker.
|
| IPC_STRUCT_BEGIN(WorkerProcessMsg_CreateWorker_Params)
|
| IPC_STRUCT_MEMBER(GURL, url)
|
| - IPC_STRUCT_MEMBER(string16, name)
|
| + IPC_STRUCT_MEMBER(base::string16, name)
|
| IPC_STRUCT_MEMBER(int, route_id)
|
| IPC_STRUCT_MEMBER(int, creator_process_id)
|
| IPC_STRUCT_MEMBER(int64, shared_worker_appcache_id)
|
| @@ -62,8 +62,8 @@ IPC_MESSAGE_CONTROL1(WorkerProcessMsg_CreateWorker,
|
| IPC_SYNC_MESSAGE_CONTROL5_1(WorkerProcessHostMsg_AllowDatabase,
|
| int /* worker_route_id */,
|
| GURL /* origin url */,
|
| - string16 /* database name */,
|
| - string16 /* database display name */,
|
| + base::string16 /* database name */,
|
| + base::string16 /* database display name */,
|
| unsigned long /* estimated size */,
|
| bool /* result */)
|
|
|
| @@ -77,7 +77,7 @@ IPC_SYNC_MESSAGE_CONTROL2_1(WorkerProcessHostMsg_AllowFileSystem,
|
| IPC_SYNC_MESSAGE_CONTROL3_1(WorkerProcessHostMsg_AllowIndexedDB,
|
| int /* worker_route_id */,
|
| GURL /* origin url */,
|
| - string16 /* database name */,
|
| + base::string16 /* database name */,
|
| bool /* result */)
|
|
|
| // Sent by the worker process to request being killed.
|
| @@ -89,9 +89,9 @@ IPC_SYNC_MESSAGE_CONTROL0_0(WorkerProcessHostMsg_ForceKillWorker)
|
| // These are messages sent from the renderer process to the worker process.
|
| IPC_MESSAGE_ROUTED5(WorkerMsg_StartWorkerContext,
|
| GURL /* url */,
|
| - string16 /* user_agent */,
|
| - string16 /* source_code */,
|
| - string16 /* content_security_policy */,
|
| + base::string16 /* user_agent */,
|
| + base::string16 /* source_code */,
|
| + base::string16 /* content_security_policy */,
|
| blink::WebContentSecurityPolicyType)
|
|
|
| IPC_MESSAGE_ROUTED0(WorkerMsg_TerminateWorkerContext)
|
|
|