Revert "Create ServiceWorkerProviderHost before starting worker"

content/browser/service_worker/embedded_worker_instance.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_INSTANCE_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_INSTANCE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 53 matching lines @@
     SCRIPT_EVALUATED,
     THREAD_STARTED,  // Happens after SCRIPT_LOADED and before SCRIPT_EVALUATED
     // Script read happens after SENT_START_WORKER and before SCRIPT_LOADED
     // (installed scripts only)
     SCRIPT_READ_STARTED,
     SCRIPT_READ_FINISHED,
     // Add new values here.
     STARTING_PHASE_MAX_VALUE,
   };
 
-  using ProviderInfoGetter =
-      base::OnceCallback<mojom::ServiceWorkerProviderInfoForStartWorkerPtr(
-          int /* process_id */)>;
-
   class Listener {
    public:
     virtual ~Listener() {}
 
     virtual void OnStarting() {}
     virtual void OnProcessAllocated() {}
     virtual void OnRegisteredToDevToolsManager() {}
     virtual void OnStartWorkerMessageSent() {}
     virtual void OnThreadStarted() {}
     virtual void OnStarted() {}
@@ skipping 17 matching lines @@
     // Returns false if the message is not handled by this listener.
     CONTENT_EXPORT virtual bool OnMessageReceived(const IPC::Message& message);
   };
 
   ~EmbeddedWorkerInstance() override;
 
   // Starts the worker. It is invalid to call this when the worker is not in
   // STOPPED status. |callback| is invoked after the worker script has been
   // started and evaluated, or when an error occurs.
   // |params| should be populated with service worker version info needed
-  // to start the worker. |provider_info_getter| is called when this instance
-  // allocates a process and is ready to send a StartWorker message.
+  // to start the worker.
   void Start(std::unique_ptr<EmbeddedWorkerStartParams> params,
-             ProviderInfoGetter provider_info_getter,
              mojom::ServiceWorkerEventDispatcherRequest dispatcher_request,
              const StatusCallback& callback);
 
   // Stops the worker. It is invalid to call this when the worker is
   // not in STARTING or RUNNING status.
   // This returns false when StopWorker IPC couldn't be sent to the worker.
   bool Stop();
 
   // Stops the worker if the worker is not being debugged (i.e. devtools is
   // not attached). This method is called by a stop-worker timer to kill
@@ skipping 98 matching lines @@
 
   // Called back from StartTask after a start worker message is sent.
   void OnStartWorkerMessageSent();
 
   // Implements mojom::EmbeddedWorkerInstanceHost.
   // These functions all run on the IO thread.
   void OnReadyForInspection() override;
   void OnScriptLoaded() override;
   // Notifies the corresponding provider host that the thread has started and is
   // ready to receive messages.
-  void OnThreadStarted(int thread_id) override;
+  void OnThreadStarted(int thread_id, int provider_id) override;
   void OnScriptLoadFailed() override;
   // Fires the callback passed to Start().
   void OnScriptEvaluated(bool success) override;
   // Changes the internal worker status from STARTING to RUNNING.
   void OnStarted() override;
   // Resets the embedded worker instance to the initial state. This will change
   // the internal status from STARTING or RUNNING to STOPPED.
   void OnStopped() override;
   void OnReportException(const base::string16& error_message,
                          int line_number,
@@ skipping 34 matching lines @@
   const int embedded_worker_id_;
 
   EmbeddedWorkerStatus status_;
   StartingPhase starting_phase_;
   int restart_count_;
 
   // Current running information.
   std::unique_ptr<EmbeddedWorkerInstance::WorkerProcessHandle> process_handle_;
   int thread_id_;
 
-  // |client_| is used to send messages to the renderer process. The browser
-  // process should not disconnect the pipe because other associated interfaces
-  // may be using it. The renderer process will disconnect the pipe when
-  // appropriate.
+  // |client_| is used to send messages to the renderer process.
   mojom::EmbeddedWorkerInstanceClientPtr client_;
 
   // Binding for EmbeddedWorkerInstanceHost, runs on IO thread.
   mojo::AssociatedBinding<EmbeddedWorkerInstanceHost> instance_host_binding_;
 
   // TODO(shimazu): Remove this after EmbeddedWorkerStartParams is changed to
   // a mojo struct.
   mojom::ServiceWorkerEventDispatcherRequest pending_dispatcher_request_;
 
-  // This is set at Start and used on SendStartWorker.
-  ProviderInfoGetter provider_info_getter_;
-
   // Whether devtools is attached or not.
   bool devtools_attached_;
 
   // True if the script load request accessed the network. If the script was
   // served from HTTPCache or ServiceWorkerDatabase this value is false.
   bool network_accessed_for_script_;
 
   ListenerList listener_list_;
   std::unique_ptr<DevToolsProxy> devtools_proxy_;
 
   std::unique_ptr<StartTask> inflight_start_task_;
 
   // This is valid only after a process is allocated for the worker.
   ServiceWorkerMetrics::StartSituation start_situation_ =
       ServiceWorkerMetrics::StartSituation::UNKNOWN;
 
   // Used for UMA. The start time of the current start sequence step.
   base::TimeTicks step_time_;
 
   base::WeakPtrFactory<EmbeddedWorkerInstance> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerInstance);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_INSTANCE_H_