Revert of Service Worker: Handle same-scope, new script registration

content/browser/service_worker/service_worker_context_unittest.cc

Index: content/browser/service_worker/service_worker_context_unittest.cc
diff --git a/content/browser/service_worker/service_worker_context_unittest.cc b/content/browser/service_worker/service_worker_context_unittest.cc
index dd287f513e03345c09c77822026ce6ac8abc6462..1bbea5fefe0d8c0916295bc2cdcfbf52cc9b046a 100644
--- a/content/browser/service_worker/service_worker_context_unittest.cc
+++ b/content/browser/service_worker/service_worker_context_unittest.cc
@@ -300,8 +300,8 @@
   base::RunLoop().RunUntilIdle();
 }
 
-// Make sure registering a new script creates a new version and shares an
-// existing registration.
+// Make sure that when a new registration replaces an existing
+// registration, that the old one is cleaned up.
 TEST_F(ServiceWorkerContextTest, RegisterNewScript) {
   GURL pattern("http://www.example.com/");
 
@@ -335,9 +335,11 @@
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(called);
 
+  // Returned IDs should be valid, and should differ from the values
+  // returned for the previous registration.
   EXPECT_NE(kInvalidServiceWorkerRegistrationId, new_registration_id);
   EXPECT_NE(kInvalidServiceWorkerVersionId, new_version_id);
-  EXPECT_EQ(old_registration_id, new_registration_id);
+  EXPECT_NE(old_registration_id, new_registration_id);
   EXPECT_NE(old_version_id, new_version_id);
 }