ServiceWorker: Make SWProviderHost listen to SWRegistration

content/browser/service_worker/service_worker_job_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/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
@@ skipping 878 matching lines @@
     ServiceWorkerRegistrationInfo info;
   };
 
   struct StateChangeLogEntry {
     int64 version_id;
     ServiceWorkerVersion::Status status;
   };
 
   UpdateJobTestHelper(int mock_render_process_id)
       : EmbeddedWorkerTestHelper(mock_render_process_id) {}
+  virtual ~UpdateJobTestHelper() {
+    if (registration_)
+      registration_->RemoveListener(this);
+  }
 
   ServiceWorkerStorage* storage() { return context()->storage(); }
   ServiceWorkerJobCoordinator* job_coordinator() {
     return context()->job_coordinator();
   }
 
   scoped_refptr<ServiceWorkerRegistration> SetupInitialRegistration(
       const GURL& test_origin) {
     scoped_refptr<ServiceWorkerRegistration> registration;
     bool called = false;
     job_coordinator()->Register(
         test_origin.Resolve(kScope),
         test_origin.Resolve(kScript),
         mock_render_process_id(),
         SaveRegistration(SERVICE_WORKER_OK, &called, &registration));
     base::RunLoop().RunUntilIdle();
     EXPECT_TRUE(called);
     EXPECT_TRUE(registration);
     EXPECT_TRUE(registration->active_version());
     EXPECT_FALSE(registration->installing_version());
     EXPECT_FALSE(registration->waiting_version());
+    registration_ = registration;
     return registration;
   }
 
   // EmbeddedWorkerTestHelper overrides
   virtual void OnStartWorker(int embedded_worker_id,
                              int64 version_id,
                              const GURL& scope,
                              const GURL& script,
                              bool pause_after_download) OVERRIDE {
     const std::string kMockScriptBody = "mock_script";
@@ skipping 26 matching lines @@
       ServiceWorkerRegistration* registration,
       ChangedVersionAttributesMask changed_mask,
       const ServiceWorkerRegistrationInfo& info) OVERRIDE {
     AttributeChangeLogEntry entry;
     entry.registration_id = registration->id();
     entry.mask = changed_mask;
     entry.info = info;
     attribute_change_log_.push_back(entry);
   }
 
+  virtual void OnRegistrationFailed(
+      ServiceWorkerRegistration* registration) OVERRIDE {
+    NOTREACHED();
+  }
+
   // ServiceWorkerVersion::Listener overrides
   virtual void OnVersionStateChanged(ServiceWorkerVersion* version) OVERRIDE {
     StateChangeLogEntry entry;
     entry.version_id = version->version_id();
     entry.status = version->status();
     state_change_log_.push_back(entry);
   }
 
+  scoped_refptr<ServiceWorkerRegistration> registration_;
+
   std::vector<AttributeChangeLogEntry> attribute_change_log_;
   std::vector<StateChangeLogEntry> state_change_log_;
 };
 
 }  // namespace
 
 TEST_F(ServiceWorkerJobTest, Update_NoChange) {
   UpdateJobTestHelper* update_helper =
       new UpdateJobTestHelper(render_process_id_);
   helper_.reset(update_helper);
@@ skipping 105 matching lines @@
   EXPECT_EQ(ServiceWorkerVersion::ACTIVATING,
             update_helper->state_change_log_[3].status);
 
   EXPECT_EQ(registration->active_version()->version_id(),
             update_helper->state_change_log_[4].version_id);
   EXPECT_EQ(ServiceWorkerVersion::ACTIVATED,
             update_helper->state_change_log_[4].status);
 }
 
 }  // namespace content