Index: content/renderer/service_worker/service_worker_script_context.cc |
diff --git a/content/renderer/service_worker/service_worker_script_context.cc b/content/renderer/service_worker/service_worker_script_context.cc |
index a3b296e9320878190fe6e8971f89bccd1cbb2e80..0d6362f02bd9ae6e93a02fd28e880698f551810d 100644 |
--- a/content/renderer/service_worker/service_worker_script_context.cc |
+++ b/content/renderer/service_worker/service_worker_script_context.cc |
@@ -9,6 +9,7 @@ |
#include "base/strings/utf_string_conversions.h" |
#include "base/trace_event/trace_event.h" |
#include "content/child/notifications/notification_data_conversions.h" |
+#include "content/child/service_worker/service_worker_message_sender.h" |
#include "content/child/service_worker/web_service_worker_registration_impl.h" |
#include "content/child/thread_safe_sender.h" |
#include "content/child/webmessageportchannel_impl.h" |
@@ -32,7 +33,7 @@ namespace content { |
namespace { |
void SendPostMessageToClientOnMainThread( |
- ThreadSafeSender* sender, |
+ ServiceWorkerMessageSender* sender, |
int routing_id, |
const std::string& uuid, |
const base::string16& message, |
@@ -43,7 +44,7 @@ void SendPostMessageToClientOnMainThread( |
} |
void SendCrossOriginMessageToClientOnMainThread( |
- ThreadSafeSender* sender, |
+ ServiceWorkerMessageSender* sender, |
int message_port_id, |
const base::string16& message, |
scoped_ptr<blink::WebMessagePortChannelArray> channels) { |
@@ -265,7 +266,7 @@ void ServiceWorkerScriptContext::PostMessageToClient( |
embedded_context_->main_thread_task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&SendPostMessageToClientOnMainThread, |
- make_scoped_refptr(embedded_context_->thread_safe_sender()), |
+ make_scoped_refptr(embedded_context_->sender()), |
GetRoutingID(), |
base::UTF16ToUTF8(uuid), |
message, base::Passed(&channels))); |
@@ -282,7 +283,7 @@ void ServiceWorkerScriptContext::PostCrossOriginMessageToClient( |
embedded_context_->main_thread_task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&SendCrossOriginMessageToClientOnMainThread, |
- make_scoped_refptr(embedded_context_->thread_safe_sender()), |
+ make_scoped_refptr(embedded_context_->sender()), |
client.clientID, message, base::Passed(&channels))); |
} |