Introduce ServiceWorkerHandle for tracking WebServiceWorkerImpl reference

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"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_job_coordinator.h"
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/browser/service_worker/service_worker_registration_status.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Unit tests for testing all job registration tasks.
 namespace content {
 
 namespace {
 
 void SaveRegistrationCallback(
     ServiceWorkerStatusCode expected_status,
     bool* called,
-    scoped_refptr<ServiceWorkerRegistration>* registration,
+    scoped_refptr<ServiceWorkerRegistration>* registration_out,
     ServiceWorkerStatusCode status,
-    ServiceWorkerVersion* result) {
+    ServiceWorkerRegistration* registration,
+    ServiceWorkerVersion* version) {
+  ASSERT_TRUE(!version || version->registration_id() == registration->id())
+      << version << " " << registration;
   EXPECT_EQ(expected_status, status);
   *called = true;
-  *registration = result ? result->registration() : NULL;
+  *registration_out = registration;
 }
 
 void SaveFoundRegistrationCallback(
     ServiceWorkerStatusCode expected_status,
     bool* called,
     scoped_refptr<ServiceWorkerRegistration>* registration,
     ServiceWorkerStatusCode status,
     const scoped_refptr<ServiceWorkerRegistration>& result) {
   EXPECT_EQ(expected_status, status);
   *called = true;
@@ skipping 403 matching lines @@
       pattern,
       render_process_id_,
       SaveUnregistration(SERVICE_WORKER_OK, &unregistration_called));
 
   ASSERT_FALSE(registration_called);
   ASSERT_FALSE(unregistration_called);
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(registration_called);
   ASSERT_TRUE(unregistration_called);
 
-  ASSERT_TRUE(registration->is_shutdown());
-
   bool find_called = false;
   storage()->FindRegistrationForPattern(
       pattern,
       SaveFoundRegistration(
           SERVICE_WORKER_ERROR_NOT_FOUND, &find_called, &registration));
 
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(scoped_refptr<ServiceWorkerRegistration>(), registration);
 }
@@ skipping 32 matching lines @@
 
   scoped_refptr<ServiceWorkerRegistration> registration;
   bool find_called = false;
   storage()->FindRegistrationForPattern(
       pattern,
       SaveFoundRegistration(
           SERVICE_WORKER_OK, &find_called, &registration));
 
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_TRUE(registration1->is_shutdown());
-  EXPECT_FALSE(registration2->is_shutdown());
   ASSERT_EQ(registration2, registration);
 }
 
 // Register the exact same pattern + script. Requests should be
 // coalesced such that both callers get the exact same registration
 // object.
 TEST_F(ServiceWorkerJobTest, ParallelRegSameScript) {
   GURL pattern("http://www.example.com/*");
 
   GURL script_url("http://www.example.com/service_worker1.js");
@@ skipping 65 matching lines @@
   storage()->FindRegistrationForPattern(
       pattern,
       SaveFoundRegistration(
           SERVICE_WORKER_ERROR_NOT_FOUND, &find_called, &registration));
 
   base::RunLoop().RunUntilIdle();
   ASSERT_EQ(scoped_refptr<ServiceWorkerRegistration>(), registration);
 }
 
 }  // namespace content