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

content/browser/service_worker/service_worker_register_job.h

Index: content/browser/service_worker/service_worker_register_job.h
diff --git a/content/browser/service_worker/service_worker_register_job.h b/content/browser/service_worker/service_worker_register_job.h
index fcfa47ea1f339a5ec54adfb420b7b77d7120c644..88704337d28cc20151f9228a656cffcbf62c7025 100644
--- a/content/browser/service_worker/service_worker_register_job.h
+++ b/content/browser/service_worker/service_worker_register_job.h
@@ -33,9 +33,9 @@
 //  - waiting for older ServiceWorkerVersions to deactivate
 //  - designating the new version to be the 'active' version
 //  - updating storage
-class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase,
-                                 public EmbeddedWorkerInstance::Listener,
-                                 public ServiceWorkerRegistration::Listener {
+class ServiceWorkerRegisterJob
+    : public ServiceWorkerRegisterJobBase,
+      public EmbeddedWorkerInstance::Listener {
  public:
   typedef base::Callback<void(ServiceWorkerStatusCode status,
                               ServiceWorkerRegistration* registration,
@@ -74,15 +74,14 @@
                            DisassociateVersionFromDocuments);
 
   enum Phase {
-    INITIAL,
-    START,
-    WAIT_FOR_UNINSTALL,
-    REGISTER,
-    UPDATE,
-    INSTALL,
-    STORE,
-    COMPLETE,
-    ABORT,
+     INITIAL,
+     START,
+     REGISTER,
+     UPDATE,
+     INSTALL,
+     STORE,
+     COMPLETE,
+     ABORT,
   };
 
   // Holds internal state of ServiceWorkerRegistrationJob, to compel use of the
@@ -95,16 +94,12 @@
     // Holds the version created by this job. It can be the 'installing',
     // 'waiting', or 'active' version depending on the phase.
     scoped_refptr<ServiceWorkerVersion> new_version;
-
-    scoped_refptr<ServiceWorkerRegistration> uninstalling_registration;
   };
 
   void set_registration(ServiceWorkerRegistration* registration);
   ServiceWorkerRegistration* registration();
   void set_new_version(ServiceWorkerVersion* version);
   ServiceWorkerVersion* new_version();
-  void set_uninstalling_registration(ServiceWorkerRegistration* registration);
-  ServiceWorkerRegistration* uninstalling_registration();
 
   void SetPhase(Phase phase);
 
@@ -115,11 +110,6 @@
       ServiceWorkerStatusCode status,
       const scoped_refptr<ServiceWorkerRegistration>& registration);
   void RegisterAndContinue(ServiceWorkerStatusCode status);
-  void WaitForUninstall(
-      const scoped_refptr<ServiceWorkerRegistration>& registration);
-  void ContinueWithRegistrationForSameScriptUrl(
-      const scoped_refptr<ServiceWorkerRegistration>& existing_registration,
-      ServiceWorkerStatusCode status);
   void UpdateAndContinue();
   void OnStartWorkerFinished(ServiceWorkerStatusCode status);
   void OnStoreRegistrationComplete(ServiceWorkerStatusCode status);
@@ -136,10 +126,6 @@
   // EmbeddedWorkerInstance::Listener override of OnPausedAfterDownload.
   virtual void OnPausedAfterDownload() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-
-  // ServiceWorkerRegistration::Listener overrides
-  virtual void OnRegistrationFinishedUninstalling(
-      ServiceWorkerRegistration* registration) OVERRIDE;
 
   void OnCompareScriptResourcesComplete(
       ServiceWorkerVersion* most_recent_version,