service worker: Wait for inflight requests before activating

content/browser/service_worker/service_worker_url_request_job_unittest.cc

Index: content/browser/service_worker/service_worker_url_request_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
index 6fcfe1b40def46c647358232585102274ca7c9f3..1030f5c9b34f3818d132c8794630a0b659b4b502 100644
--- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -254,9 +254,7 @@ class ServiceWorkerURLRequestJobTest
                       expected_response, expect_valid_ssl);
   }
 
-  bool HasInflightRequests() {
-    return version_->HasInflightRequests();
-  }
+  bool HasWork() { return version_->HasWork(); }
 
   // ServiceWorkerURLRequestJob::Delegate implementation:
   void OnPrepareToRestart() override { times_prepare_to_restart_invoked_++; }
@@ -577,9 +575,9 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse) {
   }
   stream->Finalize();
 
-  EXPECT_FALSE(HasInflightRequests());
+  EXPECT_FALSE(HasWork());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(HasInflightRequests());
+  EXPECT_TRUE(HasWork());
   EXPECT_TRUE(request_->status().is_success());
   EXPECT_EQ(200,
             request_->response_headers()->response_code());
@@ -600,7 +598,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse) {
   EXPECT_FALSE(info->service_worker_ready_time().is_null());
 
   request_.reset();
-  EXPECT_FALSE(HasInflightRequests());
+  EXPECT_FALSE(HasWork());
 }
 
 TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_DelayedRegistration) {
@@ -627,9 +625,9 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_DelayedRegistration) {
   }
   stream->Finalize();
 
-  EXPECT_FALSE(HasInflightRequests());
+  EXPECT_FALSE(HasWork());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(HasInflightRequests());
+  EXPECT_TRUE(HasWork());
   EXPECT_TRUE(request_->status().is_success());
   EXPECT_EQ(200,
             request_->response_headers()->response_code());
@@ -650,7 +648,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_DelayedRegistration) {
   EXPECT_FALSE(info->service_worker_ready_time().is_null());
 
   request_.reset();
-  EXPECT_FALSE(HasInflightRequests());
+  EXPECT_FALSE(HasWork());
 }
 
 
@@ -676,9 +674,9 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_QuickFinalize) {
       &url_request_delegate_);
   request_->set_method("GET");
   request_->Start();
-  EXPECT_FALSE(HasInflightRequests());
+  EXPECT_FALSE(HasWork());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(HasInflightRequests());
+  EXPECT_TRUE(HasWork());
   EXPECT_TRUE(request_->status().is_success());
   EXPECT_EQ(200,
             request_->response_headers()->response_code());
@@ -699,7 +697,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_QuickFinalize) {
   EXPECT_FALSE(info->service_worker_ready_time().is_null());
 
   request_.reset();
-  EXPECT_FALSE(HasInflightRequests());
+  EXPECT_FALSE(HasWork());
 }
 
 TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_Flush) {
@@ -765,9 +763,9 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponseAndCancel) {
       &url_request_delegate_);
   request_->set_method("GET");
   request_->Start();
-  EXPECT_FALSE(HasInflightRequests());
+  EXPECT_FALSE(HasWork());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(HasInflightRequests());
+  EXPECT_TRUE(HasWork());
 
   std::string expected_response;
   expected_response.reserve((sizeof(kTestData) - 1) * 1024);
@@ -777,7 +775,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponseAndCancel) {
   }
   ASSERT_TRUE(stream_context->registry()->GetStream(stream_url).get());
   request_->Cancel();
-  EXPECT_FALSE(HasInflightRequests());
+  EXPECT_FALSE(HasWork());
   ASSERT_FALSE(stream_context->registry()->GetStream(stream_url).get());
   for (int i = 0; i < 512; ++i) {
     expected_response += kTestData;
@@ -815,11 +813,11 @@ TEST_F(ServiceWorkerURLRequestJobTest,
       &url_request_delegate_);
   request_->set_method("GET");
   request_->Start();
-  EXPECT_FALSE(HasInflightRequests());
+  EXPECT_FALSE(HasWork());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(HasInflightRequests());
+  EXPECT_TRUE(HasWork());
   request_->Cancel();
-  EXPECT_FALSE(HasInflightRequests());
+  EXPECT_FALSE(HasWork());
 
   scoped_refptr<Stream> stream =
       new Stream(stream_context->registry(), nullptr, stream_url);
@@ -869,7 +867,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, FailFetchDispatch) {
   // We should have fallen back to network.
   EXPECT_EQ(200, request_->GetResponseCode());
   EXPECT_EQ("PASS", url_request_delegate_.response_data());
-  EXPECT_FALSE(HasInflightRequests());
+  EXPECT_FALSE(HasWork());
   ServiceWorkerProviderHost* host = helper_->context()->GetProviderHost(
       helper_->mock_render_process_id(), kProviderID);
   ASSERT_TRUE(host);
@@ -1003,9 +1001,9 @@ TEST_F(ServiceWorkerURLRequestJobTest, EarlyResponse) {
   EXPECT_FALSE(info->response_is_in_cache_storage());
   EXPECT_EQ(std::string(), info->response_cache_storage_cache_name());
 
-  EXPECT_TRUE(version_->HasInflightRequests());
+  EXPECT_TRUE(version_->HasWork());
   helper->FinishWaitUntil();
-  EXPECT_FALSE(version_->HasInflightRequests());
+  EXPECT_FALSE(version_->HasWork());
 }
 
 // Helper for controlling when to respond to a fetch event.
@@ -1067,12 +1065,12 @@ TEST_F(ServiceWorkerURLRequestJobTest, CancelRequest) {
   base::RunLoop().RunUntilIdle();
 
   // Respond to the fetch event.
-  EXPECT_TRUE(version_->HasInflightRequests());
+  EXPECT_TRUE(version_->HasWork());
   helper->Respond();
   base::RunLoop().RunUntilIdle();
 
   // The fetch event request should no longer be in-flight.
-  EXPECT_FALSE(version_->HasInflightRequests());
+  EXPECT_FALSE(version_->HasWork());
 }
 
 // TODO(kinuko): Add more tests with different response data and also for