ServiceWorker: Rename 'pending version' to 'installing' or 'waiting'

content/browser/service_worker/service_worker_provider_host_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/memory/weak_ptr.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_register_job.h"
 #include "content/browser/service_worker/service_worker_registration.h"
@@ skipping 96 matching lines @@
   // Disassociating one provider_host shouldn't remove all process refs
   // from the version yet.
   provider_host1_->SetActiveVersion(NULL);
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Disassociating the other provider_host will remove all process refs.
   provider_host2_->SetActiveVersion(NULL);
   ASSERT_FALSE(version_->HasProcessToRun());
 }
 
-TEST_F(ServiceWorkerProviderHostTest, SetPendingVersion_ProcessStatus) {
+TEST_F(ServiceWorkerProviderHostTest, SetWaitingVersion_ProcessStatus) {
   ASSERT_FALSE(version_->HasProcessToRun());
 
-  // Associating version_ to a provider_host's pending version will internally
+  // Associating version_ to a provider_host's waiting version will internally
   // add the provider_host's process ref to the version.
-  provider_host1_->SetPendingVersion(version_);
+  provider_host1_->SetWaitingVersion(version_);
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Re-associating the same version and provider_host should just work too.
-  provider_host1_->SetPendingVersion(version_);
+  provider_host1_->SetWaitingVersion(version_);
   ASSERT_TRUE(version_->HasProcessToRun());
 
-  // Resetting the provider_host's pending version should remove process refs
+  // Resetting the provider_host's waiting version should remove process refs
   // from the version.
-  provider_host1_->SetPendingVersion(NULL);
+  provider_host1_->SetWaitingVersion(NULL);
   ASSERT_FALSE(version_->HasProcessToRun());
 }
 
 TEST_F(ServiceWorkerProviderHostTest,
-       SetPendingVersion_MultipleHostsForSameProcess) {
+       SetWaitingVersion_MultipleHostsForSameProcess) {
   ASSERT_FALSE(version_->HasProcessToRun());
 
   // Associating version_ to two providers as active version.
-  provider_host1_->SetPendingVersion(version_);
-  provider_host2_->SetPendingVersion(version_);
+  provider_host1_->SetWaitingVersion(version_);
+  provider_host2_->SetWaitingVersion(version_);
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Disassociating one provider_host shouldn't remove all process refs
   // from the version yet.
-  provider_host1_->SetPendingVersion(NULL);
+  provider_host1_->SetWaitingVersion(NULL);
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Disassociating the other provider_host will remove all process refs.
-  provider_host2_->SetPendingVersion(NULL);
+  provider_host2_->SetWaitingVersion(NULL);
   ASSERT_FALSE(version_->HasProcessToRun());
 }
 
 class ServiceWorkerRegisterJobAndProviderHostTest
     : public ServiceWorkerProviderHostTest {
  protected:
   ServiceWorkerRegisterJobAndProviderHostTest() {}
   virtual ~ServiceWorkerRegisterJobAndProviderHostTest() {}
 
   virtual void SetUp() OVERRIDE {
     ServiceWorkerProviderHostTest::SetUp();
     register_job_.reset(new ServiceWorkerRegisterJob(
         context_->AsWeakPtr(), scope_, script_url_));
     provider_host1_->set_document_url(GURL("http://www.example.com/foo"));
     provider_host2_->set_document_url(GURL("http://www.example.com/bar"));
     provider_host3_->set_document_url(GURL("http://www.example.ca/foo"));
   }
 
   virtual void TearDown() OVERRIDE {
     ServiceWorkerProviderHostTest::TearDown();
     register_job_.reset();
   }
 
   scoped_ptr<ServiceWorkerRegisterJob> register_job_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerRegisterJobAndProviderHostTest);
 };
 
-// Test for ServiceWorkerRegisterJob::AssociatePendingVersionToDocuments.
+// Test for ServiceWorkerRegisterJob::AssociateWaitingVersionToDocuments.
 TEST_F(ServiceWorkerRegisterJobAndProviderHostTest,
-       AssociatePendingVersionToDocuments) {
-  register_job_->AssociatePendingVersionToDocuments(version_.get());
-  EXPECT_EQ(version_.get(), provider_host1_->pending_version());
-  EXPECT_EQ(version_.get(), provider_host2_->pending_version());
-  EXPECT_EQ(NULL, provider_host3_->pending_version());
+       AssociateWaitingVersionToDocuments) {
+  register_job_->AssociateWaitingVersionToDocuments(version_.get());
+  EXPECT_EQ(version_.get(), provider_host1_->waiting_version());
+  EXPECT_EQ(version_.get(), provider_host2_->waiting_version());
+  EXPECT_EQ(NULL, provider_host3_->waiting_version());
 
-  register_job_->AssociatePendingVersionToDocuments(NULL);
-  EXPECT_EQ(NULL, provider_host1_->pending_version());
-  EXPECT_EQ(NULL, provider_host2_->pending_version());
-  EXPECT_EQ(NULL, provider_host3_->pending_version());
+  register_job_->AssociateWaitingVersionToDocuments(NULL);
+  EXPECT_EQ(NULL, provider_host1_->waiting_version());
+  EXPECT_EQ(NULL, provider_host2_->waiting_version());
+  EXPECT_EQ(NULL, provider_host3_->waiting_version());
 }
 
 }  // namespace content