Service Worker: Coalesce the start worker timer into the timeout timer.

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 cc937fc51b583fde435493f895d074b564759eb5..5588a7733076d5c8d85cb12fd1e5e5b2832bafc8 100644
--- a/content/browser/service_worker/service_worker_version_unittest.cc
+++ b/content/browser/service_worker/service_worker_version_unittest.cc
@@ -464,8 +464,11 @@ TEST_F(ServiceWorkerFailToStartTest, Timeout) {
   EXPECT_EQ(ServiceWorkerVersion::STARTING, version_->running_status());
 
   // Simulate timeout.
-  EXPECT_TRUE(version_->start_worker_timeout_timer_.IsRunning());
-  version_->start_worker_timeout_timer_.user_task().Run();
+  EXPECT_TRUE(version_->timeout_timer_.IsRunning());
+  version_->start_time_ =
+      base::TimeTicks::Now() -
+      base::TimeDelta::FromMinutes(6);  // over kStartWorkerTimeoutMinutes

[nhiroki, 2015/03/10 00:37:10]

This could get broken when kStartWorkerTimeoutMinutes is modified. How about
calculating "kStartWorkerTimeoutMinutes + 1"?

[falken, 2015/03/10 06:56:36]

Done.

+  version_->timeout_timer_.user_task().Run();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(SERVICE_WORKER_ERROR_TIMEOUT, status);
   EXPECT_EQ(ServiceWorkerVersion::STOPPED, version_->running_status());