ServiceWorker: Make '.ready' return a promise to be resolved with ServiceWorkerRegistration (2/3)

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 "base/thread_task_runner_handle.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_provider_host.h"
@@ skipping 79 matching lines @@
   // add the provider_host's process ref to the version.
   registration_->SetActiveVersion(version_.get());
   ASSERT_TRUE(HasProcessToRun());
 
   // Re-associating the same version and provider_host should just work too.
   registration_->SetActiveVersion(version_.get());
   ASSERT_TRUE(HasProcessToRun());
 
   // Resetting the provider_host's active version should remove process refs
   // from the version.
-  provider_host1_->UnassociateRegistration();
+  provider_host1_->DisassociateRegistration();
   ASSERT_FALSE(HasProcessToRun());
 }
 
 TEST_F(ServiceWorkerProviderHostTest,
        SetActiveVersion_MultipleHostsForSameProcess) {
   provider_host1_->AssociateRegistration(registration_.get());
   provider_host2_->AssociateRegistration(registration_.get());
   ASSERT_TRUE(HasProcessToRun());
 
   // Associating version_ to two providers as active version.
   registration_->SetActiveVersion(version_.get());
   ASSERT_TRUE(HasProcessToRun());
 
   // Disassociating one provider_host shouldn't remove all process refs
   // from the version yet.
-  provider_host1_->UnassociateRegistration();
+  provider_host1_->DisassociateRegistration();
   ASSERT_TRUE(HasProcessToRun());
 
   // Disassociating the other provider_host will remove all process refs.
-  provider_host2_->UnassociateRegistration();
+  provider_host2_->DisassociateRegistration();
   ASSERT_FALSE(HasProcessToRun());
 }
 
 TEST_F(ServiceWorkerProviderHostTest, SetWaitingVersion_ProcessStatus) {
   provider_host1_->AssociateRegistration(registration_.get());
   ASSERT_TRUE(HasProcessToRun());
 
   // Associating version_ to a provider_host's waiting version will internally
   // add the provider_host's process ref to the version.
   registration_->SetWaitingVersion(version_.get());
   ASSERT_TRUE(HasProcessToRun());
 
   // Re-associating the same version and provider_host should just work too.
   registration_->SetWaitingVersion(version_.get());
   ASSERT_TRUE(HasProcessToRun());
 
   // Resetting the provider_host's waiting version should remove process refs
   // from the version.
-  provider_host1_->UnassociateRegistration();
+  provider_host1_->DisassociateRegistration();
   ASSERT_FALSE(HasProcessToRun());
 }
 
 TEST_F(ServiceWorkerProviderHostTest,
        SetWaitingVersion_MultipleHostsForSameProcess) {
   provider_host1_->AssociateRegistration(registration_.get());
   provider_host2_->AssociateRegistration(registration_.get());
   ASSERT_TRUE(HasProcessToRun());
 
   // Associating version_ to two providers as waiting version.
   registration_->SetWaitingVersion(version_.get());
   ASSERT_TRUE(HasProcessToRun());
 
   // Disassociating one provider_host shouldn't remove all process refs
   // from the version yet.
-  provider_host1_->UnassociateRegistration();
+  provider_host1_->DisassociateRegistration();
   ASSERT_TRUE(HasProcessToRun());
 
   // Disassociating the other provider_host will remove all process refs.
-  provider_host2_->UnassociateRegistration();
+  provider_host2_->DisassociateRegistration();
   ASSERT_FALSE(HasProcessToRun());
 }
 
 TEST_F(ServiceWorkerProviderHostTest,
        ObserveVersionAttributesChanged_Basic) {
   provider_host1_->AssociateRegistration(registration_.get());
   provider_host2_->AssociateRegistration(registration_.get());
   VerifyVersionAttributes(provider_host1_, NULL, NULL, NULL);
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
   registration_->SetInstallingVersion(version_.get());
   VerifyVersionAttributes(provider_host1_, version_.get(), NULL, NULL);
   VerifyVersionAttributes(provider_host2_, version_.get(), NULL, NULL);
 
   registration_->SetWaitingVersion(version_.get());
   VerifyVersionAttributes(provider_host1_, NULL, version_.get(), NULL);
   VerifyVersionAttributes(provider_host2_, NULL, version_.get(), NULL);
 
   // Disassociating the registration should clear all version attributes.
-  provider_host2_->UnassociateRegistration();
+  provider_host2_->DisassociateRegistration();
   VerifyVersionAttributes(provider_host1_, NULL, version_.get(), NULL);
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
   // Shouldn't notify the disassociated provider of the change.
   registration_->SetActiveVersion(version_.get());
   VerifyVersionAttributes(provider_host1_, NULL, NULL, version_.get());
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 }
 
 TEST_F(ServiceWorkerProviderHostTest,
@@ skipping 16 matching lines @@
   VerifyVersionAttributes(provider_host1_, NULL, version1.get(), NULL);
   VerifyVersionAttributes(provider_host2_, NULL, version1.get(), NULL);
 
   registration_->SetInstallingVersion(version2.get());
   VerifyVersionAttributes(
       provider_host1_, version2.get(), version1.get(), NULL);
   VerifyVersionAttributes(
       provider_host2_, version2.get(), version1.get(), NULL);
 
   // Disassociating the registration should clear all version attributes.
-  provider_host2_->UnassociateRegistration();
+  provider_host2_->DisassociateRegistration();
   VerifyVersionAttributes(
       provider_host1_, version2.get(), version1.get(), NULL);
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
   // Shouldn't notify the disassociated provider of the change.
   registration_->SetActiveVersion(version1.get());
   VerifyVersionAttributes(
       provider_host1_, version2.get(), NULL, version1.get());
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
   registration_->SetActiveVersion(version2.get());
   VerifyVersionAttributes(provider_host1_, NULL, NULL, version2.get());
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 }
 
 }  // namespace content