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

content/browser/service_worker/service_worker_version_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/run_loop.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_registration.h"
@@ skipping 363 matching lines @@
   status = SERVICE_WORKER_ERROR_FAILED;
   version_->StopWorker(CreateReceiverOnCurrentThread(&status));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(SERVICE_WORKER_OK, status);
   status = SERVICE_WORKER_ERROR_FAILED;
   version_->StartWorker(CreateReceiverOnCurrentThread(&status));
   base::RunLoop().RunUntilIdle();
   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 */,
                                     1 /* dummy provider_id */,
                                     helper_->context()->AsWeakPtr(),
                                     NULL));
   version_->AddControllee(host.get());
-  EXPECT_FALSE(version_->stop_worker_timer_.IsRunning());
+  EXPECT_TRUE(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) {
   // Initially the worker is not running. There should be no cache_listener_.
   EXPECT_FALSE(version_->cache_listener_.get());
 
   ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
   version_->StartWorker(
       CreateReceiverOnCurrentThread(&status));
   base::RunLoop().RunUntilIdle();
@@ skipping 33 matching lines @@
   helper_->context()->embedded_worker_registry()->RemoveChildProcessSender(
       process_id);
   base::RunLoop().RunUntilIdle();
 
   // Callback completed.
   EXPECT_EQ(SERVICE_WORKER_ERROR_START_WORKER_FAILED, status);
   EXPECT_EQ(ServiceWorkerVersion::STOPPED, version_->running_status());
 }
 
 }  // namespace content