Schedule the stop-worker-timer even if the ServiceWorker is controlling pages

content/browser/service_worker/service_worker_version_unittest.cc

Index: content/browser/service_worker/service_worker_version_unittest.cc
diff --git a/content/browser/service_worker/service_worker_version_unittest.cc b/content/browser/service_worker/service_worker_version_unittest.cc
index f6d4629d39d2bf4871066193c037fbc169b3599c..6196c86754d945e8b7db54e493503e7a95d902f5 100644
--- a/content/browser/service_worker/service_worker_version_unittest.cc
+++ b/content/browser/service_worker/service_worker_version_unittest.cc
@@ -381,7 +381,9 @@ TEST_F(ServiceWorkerVersionTest, ScheduleStopWorker) {
   EXPECT_EQ(SERVICE_WORKER_OK, status);
   EXPECT_TRUE(version_->stop_worker_timer_.IsRunning());
 
-  // The timer should not be running if a controllee is added.
+  base::TimeDelta delay = version_->stop_worker_timer_.GetCurrentDelay();
+
+  // Adding controllee doesn't stop the stop-worker-timer,  but...
   scoped_ptr<ServiceWorkerProviderHost> host(
       new ServiceWorkerProviderHost(33 /* dummy render process id */,
                                     MSG_ROUTING_NONE /* render_frame_id */,
@@ -389,11 +391,11 @@ TEST_F(ServiceWorkerVersionTest, ScheduleStopWorker) {
                                     helper_->context()->AsWeakPtr(),
                                     NULL));
   version_->AddControllee(host.get());
-  EXPECT_FALSE(version_->stop_worker_timer_.IsRunning());
-
-  // The timer should be running if the controllee is removed.
-  version_->RemoveControllee(host.get());
   EXPECT_TRUE(version_->stop_worker_timer_.IsRunning());
+
+  // ...it resets the timer if it's running so that the worker is kept
+  // alive for a while right after a new controlee is attached.
+  EXPECT_GE(delay, version_->stop_worker_timer_.GetCurrentDelay());

[falken, 2014/12/18 08:26:40]

I don't quite get this, what does GetCurrentDelay() return? Why does it get
smaller after the timer is reset?

[kinuko, 2014/12/18 08:31:40]

Um, nvm, this line is not right (I wanted to compare scheduled_run_time_). I'm
removing this EXPECT line.

 }
 
 TEST_F(ServiceWorkerVersionTest, ListenerAvailability) {