Commit d5215068 authored by kinuko's avatar kinuko Committed by Commit bot

ServiceWorkerVersion: remove unused SendMessage method

It looks it's no longer used in any production code.

BUG=n/a
TEST=compile

Review URL: https://codereview.chromium.org/964353002

Cr-Commit-Position: refs/heads/master@{#318677}
parent 7bca9e73
......@@ -426,22 +426,6 @@ void ServiceWorkerVersion::StartUpdate() {
context_->UpdateServiceWorker(registration);
}
void ServiceWorkerVersion::SendMessage(
const IPC::Message& message, const StatusCallback& callback) {
if (running_status() != RUNNING) {
// Schedule calling this method after starting the worker.
StartWorker(base::Bind(&RunTaskAfterStartWorker,
weak_factory_.GetWeakPtr(), callback,
base::Bind(&self::SendMessage,
weak_factory_.GetWeakPtr(),
message, callback)));
return;
}
ServiceWorkerStatusCode status = embedded_worker_->SendMessage(message);
RunSoon(base::Bind(callback, status));
}
void ServiceWorkerVersion::DispatchMessageEvent(
const base::string16& message,
const std::vector<TransferredMessagePort>& sent_message_ports,
......
......@@ -166,13 +166,6 @@ class CONTENT_EXPORT ServiceWorkerVersion
// Starts an update now.
void StartUpdate();
// Sends an IPC message to the worker.
// If the worker is not running this first tries to start it by
// calling StartWorker internally.
// |callback| can be null if the sender does not need to know if the
// message is successfully sent or not.
void SendMessage(const IPC::Message& message, const StatusCallback& callback);
// Sends a message event to the associated embedded worker.
void DispatchMessageEvent(
const base::string16& message,
......
......@@ -250,31 +250,31 @@ TEST_F(ServiceWorkerVersionTest, ConcurrentStartAndStop) {
EXPECT_EQ(SERVICE_WORKER_OK, status3);
}
TEST_F(ServiceWorkerVersionTest, SendMessage) {
TEST_F(ServiceWorkerVersionTest, DispatchEventToStoppedWorker) {
EXPECT_EQ(ServiceWorkerVersion::STOPPED, version_->running_status());
// Send a message without starting the worker.
// Dispatch an event without starting the worker.
ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
version_->SendMessage(TestMsg_Message(),
CreateReceiverOnCurrentThread(&status));
version_->SetStatus(ServiceWorkerVersion::INSTALLING);
version_->DispatchInstallEvent(-1, CreateReceiverOnCurrentThread(&status));
base::RunLoop().RunUntilIdle();
EXPECT_EQ(SERVICE_WORKER_OK, status);
// The worker should be now started.
EXPECT_EQ(ServiceWorkerVersion::RUNNING, version_->running_status());
// Stop the worker, and then send the message immediately.
ServiceWorkerStatusCode msg_status = SERVICE_WORKER_ERROR_FAILED;
// Stop the worker, and then dispatch an event immediately after that.
status = SERVICE_WORKER_ERROR_FAILED;
ServiceWorkerStatusCode stop_status = SERVICE_WORKER_ERROR_FAILED;
version_->StopWorker(CreateReceiverOnCurrentThread(&stop_status));
version_->SendMessage(TestMsg_Message(),
CreateReceiverOnCurrentThread(&msg_status));
version_->DispatchInstallEvent(
-1, CreateReceiverOnCurrentThread(&status));
base::RunLoop().RunUntilIdle();
EXPECT_EQ(SERVICE_WORKER_OK, stop_status);
// SendMessage should return SERVICE_WORKER_OK since the worker should have
// been restarted to deliver the message.
EXPECT_EQ(SERVICE_WORKER_OK, msg_status);
// Dispatch an event should return SERVICE_WORKER_OK since the worker
// should have been restarted to dispatch the event.
EXPECT_EQ(SERVICE_WORKER_OK, status);
// The worker should be now started again.
EXPECT_EQ(ServiceWorkerVersion::RUNNING, version_->running_status());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment